diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2016-10-13 16:24:30 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2016-10-13 16:26:53 +0200 |
| commit | 3abd66aa0cb8820124d249e497c95bd0cadb8ca2 (patch) | |
| tree | b20615264bf1acfadbcc87fd4d9fbce1999b47d4 /gnu/packages/make-bootstrap.scm | |
| parent | c86447f486506d468e08ef42f5683883cafadfda (diff) | |
| download | guix-3abd66aa0cb8820124d249e497c95bd0cadb8ca2.tar guix-3abd66aa0cb8820124d249e497c95bd0cadb8ca2.tar.gz | |
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.
Diffstat (limited to 'gnu/packages/make-bootstrap.scm')
| -rw-r--r-- | gnu/packages/make-bootstrap.scm | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm index def9c23b17..2c14e748f2 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 |