guix-commits
[Top][All Lists]
Advanced

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

01/01: gnu: Remove static-bash-for-bootstrap.


From: guix-commits
Subject: 01/01: gnu: Remove static-bash-for-bootstrap.
Date: Thu, 28 Nov 2019 08:24:30 -0500 (EST)

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

commit b7fd304e28a3206e565d568c3f988a72b57d0b16
Author: Efraim Flashner <address@hidden>
Date:   Thu Nov 28 15:20:37 2019 +0200

    gnu: Remove static-bash-for-bootstrap.
    
    * gnu/packages/make-bootstrap.scm (static-bash-for-bootstrap): Remove
    variable.
    (%static-inputs): Let gawk use static-bash if %current-target-system.
    Use static-bash.
---
 gnu/packages/make-bootstrap.scm | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm
index b8d1b2a..d149a7e 100644
--- a/gnu/packages/make-bootstrap.scm
+++ b/gnu/packages/make-bootstrap.scm
@@ -167,15 +167,6 @@ for `sh' in $PATH, and without nscd, and with static NSS 
modules."
                                 (current-source-location)
                                 #:native-inputs native-inputs))
 
-(define static-bash-for-bootstrap
-  (package
-    (inherit static-bash)
-    (source (origin
-              (inherit (package-source static-bash))
-              (patches
-               (cons (search-patch "bash-reproducible-linux-pgrp-pipe.patch")
-                     (origin-patches (package-source static-bash))))))))
-
 (define %static-inputs
   ;; Packages that are to be used as %BOOTSTRAP-INPUTS.
   (let ((coreutils (package (inherit coreutils)
@@ -252,7 +243,7 @@ for `sh' in $PATH, and without nscd, and with static NSS 
modules."
                                  (("-Wl,-export-dynamic") ""))
                                #t)))))))
                 (inputs (if (%current-target-system)
-                            `(("bash" ,static-bash-for-bootstrap))
+                            `(("bash" ,static-bash))
                             '()))))
        (tar (package (inherit tar)
               (arguments
@@ -298,7 +289,7 @@ for `sh' in $PATH, and without nscd, and with static NSS 
modules."
                ("sed" ,sed)
                ("grep" ,grep)
                ("gawk" ,gawk)))
-      ("bash" ,static-bash-for-bootstrap))))
+      ("bash" ,static-bash))))
 
 (define %static-binaries
   (package



reply via email to

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