ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-13 14:40:21 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
* gnu/packages/make-bootstrap.scm (%bash-static): Remove.
(%static-inputs): Use STATIC-BASH instead of %BASH-STATIC.
This commit is contained in:
Ludovic Courtès 2016-10-13 16:24:30 +02:00
parent c86447f486
commit 3abd66aa0c
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
gnu/packages/make-bootstrap.scm
View file

@ -114,9 +114,6 @@ (define (native-inputs)
(current-source-location) (current-source-location)
#:native-inputs native-inputs)) #:native-inputs native-inputs))
(define %bash-static
(static-package bash-minimal))
(define %static-inputs (define %static-inputs
;; Packages that are to be used as %BOOTSTRAP-INPUTS. ;; Packages that are to be used as %BOOTSTRAP-INPUTS.
(let ((coreutils (package (inherit coreutils) (let ((coreutils (package (inherit coreutils)
@ -184,7 +181,7 @@ (define %static-inputs
(("-Wl,-export-dynamic") ""))) (("-Wl,-export-dynamic") "")))
,phases))))) ,phases)))))
(inputs (if (%current-target-system) (inputs (if (%current-target-system)
`(("bash" ,%bash-static)) `(("bash" ,static-bash))
'())))) '()))))
(finalize (compose static-package (finalize (compose static-package
package-with-relocatable-glibc))) package-with-relocatable-glibc)))
@ -200,7 +197,7 @@ (define %static-inputs
("sed" ,sed) ("sed" ,sed)
("grep" ,grep) ("grep" ,grep)
("gawk" ,gawk))) ("gawk" ,gawk)))
("bash" ,%bash-static)))) ("bash" ,static-bash))))
(define %static-binaries (define %static-binaries
(package (package