futurile/guix-play
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gnu: commencement: file: Build file without bzip2.

Browse Source 
* gnu/packages/commencement.scm (file): New variable.  Use it instead of (gnu
packages file), removing failing bzip2 extension.
This commit is contained in:
Jan Nieuwenhuizen 2020-02-17 21:56:05 +01:00
parent f29fdd4e00
commit f8d1a95ea4
No known key found for this signature in database
GPG Key ID: F3C1A0D9C1D65273
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
gnu/packages/commencement.scm
View File

@ -5,7 +5,7 @@
;;; Copyright © 2014, 2015, 2017 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2014, 2015, 2017 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2017, 2018, 2019 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2017, 2018, 2019 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018, 2019 Jan (janneke) Nieuwenhuizen <janneke@gnu.org> ;;; Copyright © 2018, 2019, 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2019, 2020 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2019, 2020 Marius Bakke <mbakke@fastmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
@ -31,7 +31,6 @@
#:use-module (gnu packages c) #:use-module (gnu packages c)
#:use-module (gnu packages gcc) #:use-module (gnu packages gcc)
#:use-module (gnu packages m4) #:use-module (gnu packages m4)
#:use-module (gnu packages file)
#:use-module (gnu packages gawk) #:use-module (gnu packages gawk)
#:use-module (gnu packages bison) #:use-module (gnu packages bison)
#:use-module (gnu packages flex) #:use-module (gnu packages flex)
@ -2709,6 +2708,12 @@ exec " gcc "/bin/" program
,flags))) ,flags)))
(package-arguments findutils)))))) (package-arguments findutils))))))
(define file
(package
(inherit (@ (gnu packages file) file))
(arguments
`(#:configure-flags '("--disable-bzlib")))))
(define file-boot0 (define file-boot0
(package (package
(inherit file) (inherit file)
@ -2718,10 +2723,12 @@ exec " gcc "/bin/" program
`(("make" ,gnu-make-boot0) `(("make" ,gnu-make-boot0)
,@(%bootstrap-inputs+toolchain))) ,@(%bootstrap-inputs+toolchain)))
(arguments (arguments
`(#:implicit-inputs? #f `(#:tests? #f ; merge test fails
#:implicit-inputs? #f
#:guile ,%bootstrap-guile #:guile ,%bootstrap-guile
#:strip-binaries? #f #:strip-binaries? #f
#:validate-runpath? #f)))) #:validate-runpath? #f
,@(package-arguments file)))))
(define (%boot0-inputs) (define (%boot0-inputs)
`(("make" ,gnu-make-boot0) `(("make" ,gnu-make-boot0)