From e99009ad0944f73998a405e6ed0d24b23e9feade Mon Sep 17 00:00:00 2001 From: Josselin Poiret Date: Sat, 22 Apr 2023 13:55:36 +0200 Subject: gnu: bmake: Switch to G-Exps. * gnu/packages/build-tools.scm (bmake): Switch to G-Exps. Signed-off-by: Andreas Enge --- gnu/packages/build-tools.scm | 43 ++++++++++++++++++++++--------------------- 1 file changed, 22 insertions(+), 21 deletions(-) (limited to 'gnu/packages/build-tools.scm') 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 @@ generate such a compilation database.") (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 -- cgit v1.2.3