[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/10: gnu: mumi: Do not hard-code "2.2".
From: |
guix-commits |
Subject: |
02/10: gnu: mumi: Do not hard-code "2.2". |
Date: |
Sat, 21 Dec 2019 17:55:50 -0500 (EST) |
civodul pushed a commit to branch master
in repository guix.
commit 1214684bbd0770ee2e6e3f72c1cd76991c82b6c0
Author: Ludovic Courtès <address@hidden>
Date: Sat Dec 21 21:14:32 2019 +0100
gnu: mumi: Do not hard-code "2.2".
* gnu/packages/mail.scm (mumi)[arguments]: Add #:modules and
#:imported-modules. In 'wrap-executable' phase, use
'target-guile-effective-version' instead of hard-coding "2.2".
---
gnu/packages/mail.scm | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index 2689590..0404f46 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -2952,14 +2952,23 @@ replacement for the @code{urlview} program.")
"1575gn5p086sjxz5hvg6iyskq6cxf6vf50s9nsc4xgrbcqa3pv2c"))))
(build-system gnu-build-system)
(arguments
- `(#:phases
+ `(#:modules ((guix build gnu-build-system)
+ ((guix build guile-build-system)
+ #:select (target-guile-effective-version))
+ (guix build utils))
+ #:imported-modules ((guix build guile-build-system)
+ ,@%gnu-build-system-modules)
+
+ #:phases
(modify-phases %standard-phases
(add-after 'install 'wrap-executable
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(bin (string-append out "/bin"))
- (scm (string-append out "/share/guile/site/2.2"))
- (go (string-append out "/lib/guile/2.2/site-ccache")))
+ (version (target-guile-effective-version))
+ (scm (string-append out "/share/guile/site/" version))
+ (go (string-append out "/lib/guile/" version
+ "/site-ccache")))
(wrap-program (string-append bin "/mumi")
`("GUILE_LOAD_PATH" ":" prefix
(,scm ,(getenv "GUILE_LOAD_PATH")))
- branch master updated (223cb7c -> 345488d), guix-commits, 2019/12/21
- 02/10: gnu: mumi: Do not hard-code "2.2".,
guix-commits <=
- 03/10: gnu: mumi: Install .go files in the right place., guix-commits, 2019/12/21
- 01/10: guix system: Honor the build options in 'delete-generations'., guix-commits, 2019/12/21
- 05/10: gnu: mumi: Pass "--localstatedir=/var"., guix-commits, 2019/12/21
- 07/10: gnu: mumi: Add dependency on GnuTLS., guix-commits, 2019/12/21
- 09/10: gnu: libgtextutils: Build with GCC 5, guix-commits, 2019/12/21
- 08/10: services: Add Mumi service., guix-commits, 2019/12/21
- 10/10: gnu: fastx-toolkit: Build with GCC 6, guix-commits, 2019/12/21
- 06/10: gnu: mumi: Install assets., guix-commits, 2019/12/21
- 04/10: gnu: mumi: Add dependency on mumimu., guix-commits, 2019/12/21