ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-11-08 07:56:16 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: guile-dbi: Remove hard-coded guile effective version.

Browse source 
* 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.
This commit is contained in:
Arun Isaac 2021-09-08 16:11:35 +05:30
parent 6849b60f1b
commit caa4f7cd78
No known key found for this signature in database
GPG key ID: 2E25EE8B61802BB3
1 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
gnu/packages/guile-xyz.scm
View file

@ -1530,9 +1530,15 @@ (define-public guile-dbi
"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 @@ (define-public guile-dbi
#: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