Merge branch 'master' into core-updates

[jackhill/guix/guix.git] / distro / packages / m4.scm

diff --git a/distro/packages/m4.scm b/distro/packages/m4.scm
index 6f52f96..7f2bed3 100644 (file)
--- a/distro/packages/m4.scm
+++ b/distro/packages/m4.scm
@@ -46,7 +46,19 @@
                    #:patches (list (assoc-ref %build-inputs "patch/s_isdir")
                                    (assoc-ref %build-inputs
                                               "patch/readlink-EINVAL")
-                                   (assoc-ref %build-inputs "patch/gets"))))
+                                   (assoc-ref %build-inputs "patch/gets"))
+                   #:phases (alist-cons-before
+                             'check 'pre-check
+                             (lambda* (#:key inputs #:allow-other-keys)
+                               ;; Fix references to /bin/sh.
+                               (let ((bash (assoc-ref inputs "bash")))
+                                 (for-each patch-shebang
+                                           (find-files "tests" "\\.sh$"))
+                                 (substitute* (find-files "tests"
+                                                          "posix_spawn")
+                                   (("/bin/sh")
+                                    (format #f "~a/bin/bash" bash)))))
+                             %standard-phases)))
                 ((system cross-system)
                  `(#:patches (list (assoc-ref %build-inputs "patch/s_isdir")
                                    (assoc-ref %build-inputs