me/guix
Archived
1
0
Fork 0
Code Activity

gnu: Remove static-bash-for-bootstrap.

Browse source 
* 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.
This commit is contained in:
Efraim Flashner 2019-11-28 15:20:37 +02:00
parent fad5b1a6d8
commit b7fd304e28
No known key found for this signature in database
GPG key ID: 41AAE7DCCA3D8351
1 changed files with 2 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -167,15 +167,6 @@ for `sh' in $PATH, and without nscd, and with static NSS modules."
(current-source-location) (current-source-location)
#:native-inputs native-inputs)) #: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 (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)
@ -252,7 +243,7 @@ for `sh' in $PATH, and without nscd, and with static NSS modules."
(("-Wl,-export-dynamic") "")) (("-Wl,-export-dynamic") ""))
#t))))))) #t)))))))
(inputs (if (%current-target-system) (inputs (if (%current-target-system)
`(("bash" ,static-bash-for-bootstrap)) `(("bash" ,static-bash))
'())))) '()))))
(tar (package (inherit tar) (tar (package (inherit tar)
(arguments (arguments
@ -298,7 +289,7 @@ for `sh' in $PATH, and without nscd, and with static NSS modules."
("sed" ,sed) ("sed" ,sed)
("grep" ,grep) ("grep" ,grep)
("gawk" ,gawk))) ("gawk" ,gawk)))
("bash" ,static-bash-for-bootstrap)))) ("bash" ,static-bash))))
(define %static-binaries (define %static-binaries
(package (package