diff options
| author | Arun Isaac <arunisaac@systemreboot.net> | 2021-09-08 16:11:35 +0530 |
|---|---|---|
| committer | Arun Isaac <arunisaac@systemreboot.net> | 2021-10-03 19:32:49 +0530 |
| commit | caa4f7cd786c89d7c0589171f9464ce433a97240 (patch) | |
| tree | 95b473607977b06f3a6b9dcff46f2a45b752bf1d | |
| parent | 6849b60f1b78ca8bf7ae09ebac35be4b23d177f9 (diff) | |
| download | guix-caa4f7cd786c89d7c0589171f9464ce433a97240.tar.gz guix-caa4f7cd786c89d7c0589171f9464ce433a97240.zip | |
gnu: guile-dbi: Remove hard-coded guile effective version.
* gnu/packages/guile-xyz.scm (guile-dbi)[arguments]: Import
target-guile-effective-version from (guix build guile-build-system). Use
target-guile-effective-version to determine the guile effective version.
| -rw-r--r-- | gnu/packages/guile-xyz.scm | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 8bde68da88..5ce503eda5 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -1530,9 +1530,15 @@ library}.") "0nswd067gvpy9pnig409ympkw29akh9lb2i6g3w7r18g1s0ivah2")))) (build-system gnu-build-system) (arguments - '(#:configure-flags + `(#:modules (((guix build guile-build-system) + #:select (target-guile-effective-version)) + ,@%gnu-build-system-modules) + #:imported-modules ((guix build guile-build-system) + ,@%gnu-build-system-modules) + #:configure-flags (list (string-append - "--with-guile-site-dir=" %output "/share/guile/site/2.2")) + "--with-guile-site-dir=" %output "/share/guile/site/" + (target-guile-effective-version (assoc-ref %build-inputs "guile")))) #:make-flags (list (string-append "LDFLAGS=-Wl,-rpath=" %output "/lib:" @@ -1541,11 +1547,13 @@ library}.") #:phases (modify-phases %standard-phases (add-after 'install 'patch-extension-path - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (dbi.scm (string-append - out "/share/guile/site/2.2/dbi/dbi.scm")) - (ext (string-append out "/lib/libguile-dbi"))) + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (dbi.scm (string-append out "/share/guile/site/" + (target-guile-effective-version + (assoc-ref inputs "guile")) + "/dbi/dbi.scm")) + (ext (string-append out "/lib/libguile-dbi"))) (substitute* dbi.scm (("libguile-dbi") ext)) #t)))))) (inputs |