diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2019-12-21 21:14:32 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2019-12-21 23:55:24 +0100 |
| commit | 1214684bbd0770ee2e6e3f72c1cd76991c82b6c0 (patch) | |
| tree | 7566b6bef608a1e348cf8100161c0d461e2577c3 | |
| parent | 89bbcc80d7a6867515ba1057c98accf41cbb9077 (diff) | |
| download | guix-1214684bbd0770ee2e6e3f72c1cd76991c82b6c0.tar.gz | |
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".
| -rw-r--r-- | gnu/packages/mail.scm | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 26895907a7..0404f46a49 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"))) |