summaryrefslogtreecommitdiff
path: root/gnu/packages/guile-xyz.scm
diff options
context:
space:
mode:
authorArun Isaac <arunisaac@systemreboot.net>2021-09-08 16:24:10 +0530
committerArun Isaac <arunisaac@systemreboot.net>2021-10-03 19:32:50 +0530
commit9a63dc335f2134727c3aa2a88fa222197b4824be (patch)
tree0433c29ed7cf049d9aa0d038b4a9d0be4342f8cd /gnu/packages/guile-xyz.scm
parentcaa4f7cd786c89d7c0589171f9464ce433a97240 (diff)
gnu: guile-dbi: Search for dbd libraries using native-search-paths.
* 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.
Diffstat (limited to 'gnu/packages/guile-xyz.scm')
-rw-r--r--gnu/packages/guile-xyz.scm14
1 files changed, 5 insertions, 9 deletions
diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm
index 5ce503eda5..b5e2b86518 100644
--- a/gnu/packages/guile-xyz.scm
+++ b/gnu/packages/guile-xyz.scm
@@ -1539,11 +1539,6 @@ library}.")
(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 @@ library}.")
(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 @@ library}.")
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