me
/
guix
Archived
1
0
Fork 0
Code

gnu: make-bootstrap: Inherit tar arguments in %static-inputs. 

* gnu/packages/make-bootstrap.scm (%static-inputs)[tar]: Use
SUBSTITUTE-KEYWORD-ARGUMENTS so #:make-flags are inherited.
master
Marius Bakke 2018-04-05 23:42:26 +02:00
parent 44e3e431cd
commit 3359a70834
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
gnu/packages/make-bootstrap.scm
View File

@ -190,15 +190,17 @@ for `sh' in $PATH, and without nscd, and with static NSS modules."
'()))))
(tar (package (inherit tar)
(arguments
'(#:phases (modify-phases %standard-phases
(add-before 'build 'set-shell-file-name
(lambda _
;; Do not use "/bin/sh" to run programs; see
;; <http://lists.gnu.org/archive/html/guix-devel/2016-09/msg02272.html>.
(substitute* "src/system.c"
(("/bin/sh") "sh")
(("execv ") "execvp "))
#t)))))))
(substitute-keyword-arguments (package-arguments tar)
((#:phases phases)
`(modify-phases ,phases
(replace 'set-shell-file-name
(lambda _
;; Do not use "/bin/sh" to run programs; see
;; <http://lists.gnu.org/archive/html/guix-devel/2016-09/msg02272.html>.
(substitute* "src/system.c"
(("/bin/sh") "sh")
(("execv ") "execvp "))
#t))))))))
;; We don't want to retain a reference to /gnu/store in the bootstrap
;; versions of egrep/fgrep, so we remove the custom phase added since
;; grep@2.25. The effect is 'egrep' and 'fgrep' look for 'grep' in