Merge branch 'core-updates'

Conflicts:
	guix/build/union.scm

1 files changed, 12 insertions, 8 deletions

diff --git a/distro/packages/acl.scm b/distro/packages/acl.scm
index 4f425be253..068789b562 100644
--- a/distro/packages/acl.scm
+++ b/distro/packages/acl.scm
@@ -41,15 +41,19 @@
     (build-system gnu-build-system)
     (arguments
      `(#:phases
-       (alist-replace 'check
-                      (lambda _
-                        (patch-shebang "test/run")
-                        (system* "make" "tests" "-C" "test")
+       (alist-cons-after
+        'configure 'patch-makefile-SHELL
+        (lambda _
+          (patch-makefile-SHELL "include/buildmacros"))
+        (alist-replace
+         'check
+         (lambda _
+           (system* "make" "tests" "-C" "test")
 
-                        ;; XXX: Ignore the test result since this is
-                        ;; dependent on the underlying file system.
-                        #t)
-                      %standard-phases)))
+           ;; XXX: Ignore the test result since this is
+           ;; dependent on the underlying file system.
+           #t)
+         %standard-phases))))
     (inputs `(("attr" ,attr)
               ("gettext" ,guix:gettext)
               ("perl" ,perl)))