02/03: gnu: make-bootstrap: Inherit tar arguments in %static-inputs.

[Marius Bakke]

mbakke pushed a commit to branch core-updates
in repository guix.

commit 3359a70834f80f36ce8ef673f0f8adc1cc66d0d5
Author: Marius Bakke <address@hidden>
Date:   Thu Apr 5 23:42:26 2018 +0200

    gnu: make-bootstrap: Inherit tar arguments in %static-inputs.
    
    * gnu/packages/make-bootstrap.scm (%static-inputs)[tar]: Use
    SUBSTITUTE-KEYWORD-ARGUMENTS so #:make-flags are inherited.
---
 gnu/packages/make-bootstrap.scm | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm
index a57491a..475749b 100644
--- a/gnu/packages/make-bootstrap.scm
+++ b/gnu/packages/make-bootstrap.scm
@@ -190,15 +190,17 @@ for `sh' in $PATH, and without nscd, and with static NSS 
modules."
                             '()))))
        (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)))))))
+                (substitute-keyword-arguments (package-arguments tar)
+                  ((#:phases phases)
+                   `(modify-phases ,phases
+                      (replace '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))))))))
         ;; We don't want to retain a reference to /gnu/store in the bootstrap
         ;; versions of egrep/fgrep, so we remove the custom phase added since
         ;; address@hidden The effect is 'egrep' and 'fgrep' look for 'grep' in