diff options
| author | Jan Nieuwenhuizen <janneke@gnu.org> | 2020-02-17 21:56:05 +0100 |
|---|---|---|
| committer | Jan Nieuwenhuizen <janneke@gnu.org> | 2020-02-17 23:21:00 +0100 |
| commit | f8d1a95ea45475d106289b32cb07e5aa762ebd30 (patch) | |
| tree | 3a84473ba93b57a2ac53bc5964e4065a13f06994 | |
| parent | f29fdd4e00cc41b13a1d5e5033d7525e4dbf8d04 (diff) | |
| download | guix-f8d1a95ea45475d106289b32cb07e5aa762ebd30.tar.gz | |
gnu: commencement: file: Build file without bzip2.
* gnu/packages/commencement.scm (file): New variable. Use it instead of (gnu packages file), removing failing bzip2 extension.
| -rw-r--r-- | gnu/packages/commencement.scm | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 2c0ddfce78..b5d27e8f96 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2014, 2015, 2017 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2017, 2018, 2019 Efraim Flashner <efraim@flashner.co.il> ;;; 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> ;;; ;;; This file is part of GNU Guix. @@ -31,7 +31,6 @@ #:use-module (gnu packages c) #:use-module (gnu packages gcc) #:use-module (gnu packages m4) - #:use-module (gnu packages file) #:use-module (gnu packages gawk) #:use-module (gnu packages bison) #:use-module (gnu packages flex) @@ -2709,6 +2708,12 @@ exec " gcc "/bin/" program ,flags))) (package-arguments findutils)))))) +(define file + (package + (inherit (@ (gnu packages file) file)) + (arguments + `(#:configure-flags '("--disable-bzlib"))))) + (define file-boot0 (package (inherit file) @@ -2718,10 +2723,12 @@ exec " gcc "/bin/" program `(("make" ,gnu-make-boot0) ,@(%bootstrap-inputs+toolchain))) (arguments - `(#:implicit-inputs? #f + `(#:tests? #f ; merge test fails + #:implicit-inputs? #f #:guile ,%bootstrap-guile #:strip-binaries? #f - #:validate-runpath? #f)))) + #:validate-runpath? #f + ,@(package-arguments file))))) (define (%boot0-inputs) `(("make" ,gnu-make-boot0) |