diff options
| author | Mark H Weaver <mhw@netris.org> | 2016-10-23 14:16:39 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2016-10-23 14:16:39 -0400 |
| commit | ca0635b4ba1af6f4ef1f54cb13fe6cedd8c5aff3 (patch) | |
| tree | 1b3e014c4e0398ecb63d1b88ee06b09d0c0c5a56 /gnu/packages/make-bootstrap.scm | |
| parent | f08add0c5a3f1f7200b0a00e17ed880692d2244b (diff) | |
| parent | 903276d066ab9733c253d2a15b7ae135ef2ef836 (diff) | |
| download | gnu-guix-ca0635b4ba1af6f4ef1f54cb13fe6cedd8c5aff3.tar gnu-guix-ca0635b4ba1af6f4ef1f54cb13fe6cedd8c5aff3.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/make-bootstrap.scm')
| -rw-r--r-- | gnu/packages/make-bootstrap.scm | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm index 1b7352fc10..d2df69d1e5 100644 --- a/gnu/packages/make-bootstrap.scm +++ b/gnu/packages/make-bootstrap.scm @@ -183,6 +183,17 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." (inputs (if (%current-target-system) `(("bash" ,static-bash)) '())))) + (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 |