nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: %static-inputs: Use bash from PATH in bootstrap tar. 

gnu/packages/make-bootstrap.scm (%static-inputs): Use bash from PATH.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
This commit is contained in:
Carlos Sánchez de La Lama 2016-10-18 17:55:55 +02:00 committed by Ludovic Courtès
parent c21b1a1fbb
commit 80c9164fd7
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -186,6 +186,17 @@ for `sh' in $PATH, and without nscd, and with static NSS modules."
(inputs (if (%current-target-system) (inputs (if (%current-target-system)
`(("bash" ,%bash-static)) `(("bash" ,%bash-static))
'())))) '()))))
(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)))))))
(finalize (compose static-package (finalize (compose static-package
package-with-relocatable-glibc))) package-with-relocatable-glibc)))
`(,@(map (match-lambda `(,@(map (match-lambda