gnu: bmake: Switch to G-Exps.

* gnu/packages/build-tools.scm (bmake): Switch to G-Exps.

Signed-off-by: Andreas Enge <andreas@enge.fr>

gnu/packages/build-tools.scm

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