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

[Ludovic Courtès]

civodul pushed a commit to branch master
in repository guix.

commit 80c9164fd7741e3bb3da368666f41c49a456d990
Author: Carlos Sánchez de La Lama <address@hidden>
Date:   Tue Oct 18 17:55:55 2016 +0200

    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 <address@hidden>
---
 gnu/packages/make-bootstrap.scm |   11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm
index def9c23..336ad2e 100644
--- a/gnu/packages/make-bootstrap.scm
+++ b/gnu/packages/make-bootstrap.scm
@@ -186,6 +186,17 @@ for `sh' in $PATH, and without nscd, and with static NSS 
modules."
                 (inputs (if (%current-target-system)
                             `(("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
                            package-with-relocatable-glibc)))
     `(,@(map (match-lambda