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: Search for dbd libraries using native-search-paths.

Browse source 
* gnu/packages/guile-xyz.scm (guile-dbi)[arguments]: Do not set LDFLAGS and
RPATH in #:make-flags.
[inputs]: Remove guile-dbd-sqlite3 and guile-dbd-postgresql.
[native-search-paths]: Add GUILE_DBD_PATH.
This commit is contained in:
Arun Isaac 2021-09-08 16:24:10 +05:30
parent caa4f7cd78
commit 9a63dc335f
No known key found for this signature in database
GPG key ID: 2E25EE8B61802BB3
1 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1539,11 +1539,6 @@ (define-public guile-dbi
(list (string-append
"--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:"
(assoc-ref %build-inputs "guile-dbd-sqlite3") "/lib" ":"
(assoc-ref %build-inputs "guile-dbd-postgresql") "/lib"))
#:phases
(modify-phases %standard-phases
(add-after 'install 'patch-extension-path
@ -1556,9 +1551,6 @@ (define-public guile-dbi
(ext (string-append out "/lib/libguile-dbi")))
(substitute* dbi.scm (("libguile-dbi") ext))
#t))))))
(inputs
`(("guile-dbd-sqlite3" ,guile-dbd-sqlite3)
("guile-dbd-postgresql" ,guile-dbd-postgresql))) ; only shared library, no scheme files
(native-inputs
`(("autoconf" ,autoconf)
("automake" ,automake)
@ -1574,7 +1566,11 @@ (define-public guile-dbi
SQL databases. Database programming with guile-dbi is generic in that the same
programming interface is presented regardless of which database system is used.
It currently supports MySQL, Postgres and SQLite3.")
(license license:gpl2+)))
(license license:gpl2+)
(native-search-paths
(list (search-path-specification
(variable "GUILE_DBD_PATH")
(files '("lib")))))))
(define guile-dbi-bootstrap
(package