guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

44/64: gnu: commencement: file: Build file without bzip2.


From: guix-commits
Subject: 44/64: gnu: commencement: file: Build file without bzip2.
Date: Tue, 18 Feb 2020 01:18:12 -0500 (EST)

janneke pushed a commit to branch core-updates
in repository guix.

commit f8d1a95ea45475d106289b32cb07e5aa762ebd30
Author: Jan Nieuwenhuizen <address@hidden>
AuthorDate: Mon Feb 17 21:56:05 2020 +0100

    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.
---
 gnu/packages/commencement.scm | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index 2c0ddfc..b5d27e8 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -5,7 +5,7 @@
 ;;; Copyright © 2014, 2015, 2017 Mark H Weaver <address@hidden>
 ;;; Copyright © 2017, 2018, 2019 Efraim Flashner <address@hidden>
 ;;; Copyright © 2018 Tobias Geerinckx-Rice <address@hidden>
-;;; Copyright © 2018, 2019 Jan (janneke) Nieuwenhuizen <address@hidden>
+;;; Copyright © 2018, 2019, 2020 Jan (janneke) Nieuwenhuizen <address@hidden>
 ;;; Copyright © 2019, 2020 Marius Bakke <address@hidden>
 ;;;
 ;;; 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)



reply via email to

[Prev in Thread] Current Thread [Next in Thread]