diff options
author | Ludovic Courtès <ludo@gnu.org> | 2022-06-08 14:46:24 +0200 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2022-06-08 14:46:24 +0200 |
commit | 8c3e9da13a3c92a7db308db8c0d81cb474ad7799 (patch) | |
tree | 88d06952aa5cc3a9c4991d9c43eb7950ff174fe1 /gnu/packages/mercury.scm | |
parent | 5439c04ebdb7b6405f5ea2446b375f1d155a8d95 (diff) | |
parent | 0c5299200ffcd16370f047b7ccb187c60f30da34 (diff) | |
download | guix-8c3e9da13a3c92a7db308db8c0d81cb474ad7799.tar.gz guix-8c3e9da13a3c92a7db308db8c0d81cb474ad7799.zip |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/mercury.scm')
-rw-r--r-- | gnu/packages/mercury.scm | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/gnu/packages/mercury.scm b/gnu/packages/mercury.scm index fe02b34a97..1c7f5c5f55 100644 --- a/gnu/packages/mercury.scm +++ b/gnu/packages/mercury.scm @@ -31,7 +31,7 @@ #:use-module (gnu packages shells) #:use-module (gnu packages bison) #:use-module (gnu packages pkg-config) - #:use-module (ice-9 match)) ; match-lambda + #:use-module ((ice-9 match) #:select (match-lambda))) ;; NOTE: Mercury uses a tightly coupled fork of BDWGC and ;; libatomic-ops. When updating the package, please check the GitHub @@ -100,8 +100,7 @@ (invoke "mv" orig-name new-name) (with-directory-excursion new-name (apply patch-source-shebangs (list #:source src))))) - `((,libatomic-ops "source" "boehm_gc/libatomic_ops"))) - #t))) + `((,libatomic-ops "source" "boehm_gc/libatomic_ops")))))) (add-after 'replace-boehm-gc 'patch-paths (lambda _ (substitute* @@ -133,8 +132,7 @@ "boehm_gc/Makefile.direct") (("/bin/sh") (which "sh")) (("/bin/pwd") (which "pwd")) - (("/bin/rm") (which "rm"))) - #t))))) + (("/bin/rm") (which "rm")))))))) (native-inputs `(("texinfo" ,texinfo) ("flex" ,flex) @@ -227,12 +225,10 @@ separate compilation, and numerous optimization/time trade-offs.") (("/bin/sh") (which "sh")) (("/bin/pwd") (which "pwd")) (("/bin/rm") (which "rm")) - (("boehm_gc/.git") "boehm_gc")) - #t)) + (("boehm_gc/.git") "boehm_gc")))) (replace 'bootstrap (lambda _ - (invoke "./prepare.sh") - #t)))))) + (invoke "./prepare.sh"))))))) ;; TODO: Uncomment phase when tests are enabled. ;; (replace 'check ;; (lambda _ |