01/03: gnu: sed: Use the same phases whether or not we're cross-compiling.

[Ludovic Courtès]

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

commit 8a296947a6bdd173faeb5d7defba7069b537ddd4
Author: Ludovic Courtès <address@hidden>
Date:   Sat Jan 21 22:37:06 2017 +0100

    gnu: sed: Use the same phases whether or not we're cross-compiling.
    
    * gnu/packages/base.scm (sed)[arguments]: Make #:phases argument
    unconditional.  In 'patch-test-suite' phase, use (which "sh") instead of
    referring to the "bash" input.
---
 gnu/packages/base.scm |   25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
index 4898b18..dc6ce4f 100644
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2012, 2013, 2014, 2015, 2016 Ludovic Courtès <address@hidden>
+;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017 Ludovic Courtès 
<address@hidden>
 ;;; Copyright © 2014 Andreas Enge <address@hidden>
 ;;; Copyright © 2012 Nikita Karetnikov <address@hidden>
 ;;; Copyright © 2014, 2015, 2016 Mark H Weaver <address@hidden>
@@ -129,19 +129,16 @@ including, for example, recursive directory searching.")
    (build-system gnu-build-system)
    (synopsis "Stream editor")
    (arguments
-    (if (%current-target-system)
-        '()
-        `(#:phases
-          (modify-phases %standard-phases
-            (add-before 'patch-source-shebangs 'patch-test-suite
-              (lambda* (#:key inputs #:allow-other-keys)
-                (let ((bash (assoc-ref inputs "bash")))
-                  (patch-makefile-SHELL "testsuite/Makefile.tests")
-                  (substitute* '("testsuite/bsd.sh"
-                                 "testsuite/bug-regex9.c")
-                    (("/bin/sh")
-                     (string-append bash "/bin/sh")))
-                  #t)))))))
+    `(#:phases
+      (modify-phases %standard-phases
+        (add-before 'patch-source-shebangs 'patch-test-suite
+          (lambda* (#:key inputs #:allow-other-keys)
+            (patch-makefile-SHELL "testsuite/Makefile.tests")
+            (substitute* '("testsuite/bsd.sh"
+                           "testsuite/bug-regex9.c")
+              (("/bin/sh")
+               (which "sh")))
+            #t)))))
    (native-inputs
     `(("perl" ,perl))) ; for build-aux/help2man
    (description