[bug#63014] [PATCH 1/2] gnu: bmake: Switch to G-Exps.

[Josselin Poiret via Guix-patches via <guix-patches@gnu.org>]

* gnu/packages/build-tools.scm (bmake): Switch to G-Exps.
---
 gnu/packages/build-tools.scm | 43 ++++++++++++++++++------------------
 1 file changed, 22 insertions(+), 21 deletions(-)

diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm
index e1c9b14bb2..0b0e979faa 100644
--- a/gnu/packages/build-tools.scm
+++ b/gnu/packages/build-tools.scm
@@ -185,27 +185,28 @@ (define-public bmake
     (native-inputs
      (list coreutils))
     (arguments
-     `(#:tests? #f                      ; test during build
-       #:phases
-       (modify-phases %standard-phases
-         (add-after 'configure 'fix-test ; fix from nixpkgs
-           (lambda _
-             (substitute* "unit-tests/unexport-env.mk"
-               (("PATH=\t/bin:/usr/bin:/sbin:/usr/sbin")
-                "PATH := ${PATH}"))))
-         (add-after 'configure 'remove-fail-tests
-           (lambda _
-             (substitute* "unit-tests/Makefile"
-               (("cmd-interrupt") "")
-               (("varmod-localtime") "")))))
-       #:configure-flags
-       (list
-        (string-append
-         "--with-defshell=" (assoc-ref %build-inputs "bash") "/bin/bash")
-        (string-append
-         "--with-default-sys-path=" (assoc-ref %outputs "out") "/share/mk"))
-       #:make-flags
-       (list "INSTALL=install"))) ;; use coreutils install
+     (list
+      #:tests? #f                       ; test during build
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'configure 'fix-test ; fix from nixpkgs
+            (lambda _
+              (substitute* "unit-tests/unexport-env.mk"
+                (("PATH=\t/bin:/usr/bin:/sbin:/usr/sbin")
+                 "PATH := ${PATH}"))))
+          (add-after 'configure 'remove-fail-tests
+            (lambda _
+              (substitute* "unit-tests/Makefile"
+                (("cmd-interrupt") "")
+                (("varmod-localtime") "")))))
+      #:configure-flags
+      #~(list
+         (string-append
+          "--with-defshell=" #$(this-package-input "bash-minimal") "/bin/bash")
+         (string-append
+          "--with-default-sys-path=" #$output "/share/mk"))
+      #:make-flags
+      #~(list "INSTALL=install"))) ;; use coreutils install
     (home-page "http://www.crufty.net/help/sjg/bmake.htm")
     (synopsis "BSD's make")
     (description

base-commit: 3f7ae420d8a54d4e2ab7f349c40d8930fe9e0771
-- 
2.39.2