From 80c9164fd7741e3bb3da368666f41c49a456d990 Mon Sep 17 00:00:00 2001
From: Carlos Sánchez de La Lama <csanchezdll@gmail.com>
Date: Tue, 18 Oct 2016 17:55:55 +0200
Subject: gnu: %static-inputs: Use bash from PATH in bootstrap tar.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
---
 gnu/packages/make-bootstrap.scm | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'gnu/packages/make-bootstrap.scm')

diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm
index def9c23b17..336ad2ee13 100644
--- a/gnu/packages/make-bootstrap.scm
+++ b/gnu/packages/make-bootstrap.scm
@@ -186,6 +186,17 @@ (define %static-inputs
                 (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
-- 
cgit v1.2.3