02/02: gnu: make-bootstrap: Remove duplicate definition of 'bash-static'.

[Ludovic Courtès]

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

commit 3abd66aa0cb8820124d249e497c95bd0cadb8ca2
Author: Ludovic Courtès <address@hidden>
Date:   Thu Oct 13 16:24:30 2016 +0200

    gnu: make-bootstrap: Remove duplicate definition of 'bash-static'.
    
    * gnu/packages/make-bootstrap.scm (%bash-static): Remove.
    (%static-inputs): Use STATIC-BASH instead of %BASH-STATIC.
---
 gnu/packages/make-bootstrap.scm |    7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm
index def9c23..2c14e74 100644
--- a/gnu/packages/make-bootstrap.scm
+++ b/gnu/packages/make-bootstrap.scm
@@ -114,9 +114,6 @@ for `sh' in $PATH, and without nscd, and with static NSS 
modules."
                                 (current-source-location)
                                 #:native-inputs native-inputs))
 
-(define %bash-static
-  (static-package bash-minimal))
-
 (define %static-inputs
   ;; Packages that are to be used as %BOOTSTRAP-INPUTS.
   (let ((coreutils (package (inherit coreutils)
@@ -184,7 +181,7 @@ for `sh' in $PATH, and without nscd, and with static NSS 
modules."
                               (("-Wl,-export-dynamic") "")))
                           ,phases)))))
                 (inputs (if (%current-target-system)
-                            `(("bash" ,%bash-static))
+                            `(("bash" ,static-bash))
                             '()))))
         (finalize (compose static-package
                            package-with-relocatable-glibc)))
@@ -200,7 +197,7 @@ for `sh' in $PATH, and without nscd, and with static NSS 
modules."
                ("sed" ,sed)
                ("grep" ,grep)
                ("gawk" ,gawk)))
-      ("bash" ,%bash-static))))
+      ("bash" ,static-bash))))
 
 (define %static-binaries
   (package