mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-25 22:08:16 -05:00
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.
This commit is contained in:
parent
c86447f486
commit
3abd66aa0c
1 changed files with 2 additions and 5 deletions
|
@ -114,9 +114,6 @@ (define (native-inputs)
|
|||
(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 @@ (define %static-inputs
|
|||
(("-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 @@ (define %static-inputs
|
|||
("sed" ,sed)
|
||||
("grep" ,grep)
|
||||
("gawk" ,gawk)))
|
||||
("bash" ,%bash-static))))
|
||||
("bash" ,static-bash))))
|
||||
|
||||
(define %static-binaries
|
||||
(package
|
||||
|
|
Loading…
Reference in a new issue