guix-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

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


From: Carlos Sánchez de La Lama
Subject: [PATCH] gnu: %static-inputs: Use bash from PATH in bootstrap tar.
Date: Tue, 18 Oct 2016 17:55:55 +0200
User-agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3 (gnu/linux)

See
<http://lists.gnu.org/archive/html/guix-devel/2016-09/msg02272.html>.

gnu/packages/make-bootstrap.scm (%static-inputs): Use bash from PATH.
---
 gnu/packages/make-bootstrap.scm | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm
index def9c23..180ca72 100644
--- a/gnu/packages/make-bootstrap.scm
+++ b/gnu/packages/make-bootstrap.scm
@@ -186,6 +186,16 @@ 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.
+                                (substitute* "src/system.c"
+                                  (("/bin/sh") "sh")
+                                  (("execv ") "execvp "))
+                                #t)))))))
         (finalize (compose static-package
                            package-with-relocatable-glibc)))
     `(,@(map (match-lambda
-- 
2.9.2



reply via email to

[Prev in Thread] Current Thread [Next in Thread]