[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
09/12: gnu: guile-wm: Always use the input Guile's effective version.
From: |
guix-commits |
Subject: |
09/12: gnu: guile-wm: Always use the input Guile's effective version. |
Date: |
Thu, 26 May 2022 15:41:32 -0400 (EDT) |
nckx pushed a commit to branch master
in repository guix.
commit 83a760dd58fe975fc32b94161ae076a726e8b9a0
Author: Tobias Geerinckx-Rice <me@tobias.gr>
AuthorDate: Sun May 22 02:00:03 2022 +0200
gnu: guile-wm: Always use the input Guile's effective version.
* gnu/packages/guile-wm.scm (guile-wm)[arguments]: Replace hard-coded
version number with that of the "guile" input.
---
gnu/packages/guile-wm.scm | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/guile-wm.scm b/gnu/packages/guile-wm.scm
index fd7a722a28..2487f89f97 100644
--- a/gnu/packages/guile-wm.scm
+++ b/gnu/packages/guile-wm.scm
@@ -95,14 +95,17 @@ dependencies.")
(ice-9 popen))
;; The '.scm' files go to $(datadir), so set that to the
;; standard value.
- #:configure-flags (list (string-append "--datadir="
- (assoc-ref %outputs "out")
- "/share/guile/site/2.2"))
+ #:configure-flags
+ (let ((out (assoc-ref %outputs "out"))
+ (effective ,(version-major+minor
+ (package-version (this-package-input "guile")))))
+ (list (string-append "--datadir=" out
+ "/share/guile/site/" effective)))
#:phases
(modify-phases %standard-phases
(add-before 'configure 'set-module-directory
(lambda* (#:key outputs #:allow-other-keys)
- ;; Install .scm files to $out/share/guile/site/2.2.
+ ;; Install .scm files to $out/share/guile/site/x.y.
(let ((out (assoc-ref outputs "out"))
(effective (read-line
(open-pipe* OPEN_READ
- 01/12: gnu: jc: Update to 1.19.0., (continued)
- 01/12: gnu: jc: Update to 1.19.0., guix-commits, 2022/05/26
- 06/12: gnu: python-aiounittest: Update to 1.4.1., guix-commits, 2022/05/26
- 11/12: gnu: libcbor: Update to 0.9.0., guix-commits, 2022/05/26
- 04/12: gnu: python-fitsio: Update to 1.1.7., guix-commits, 2022/05/26
- 03/12: gnu: python-astroquery: Update to 0.4.6., guix-commits, 2022/05/26
- 02/12: gnu: emacs-list-utils: Update to 0.4.6-1.0dec8c0., guix-commits, 2022/05/26
- 05/12: gnu: python-jplephem: Update to 2.17., guix-commits, 2022/05/26
- 07/12: gnu: guile-xcb: Always use the input Guile's effective version., guix-commits, 2022/05/26
- 10/12: gnu: guile-wm: Remove trailing #t from phases., guix-commits, 2022/05/26
- 12/12: gnu: libcbor: Mark up description., guix-commits, 2022/05/26
- 09/12: gnu: guile-wm: Always use the input Guile's effective version.,
guix-commits <=