03/10: gnu: guile-dbi: Search for dbd libraries using native-search-paths.

[guix-commits]

arunisaac pushed a commit to branch master
in repository guix.

commit 9a63dc335f2134727c3aa2a88fa222197b4824be
Author: Arun Isaac <arunisaac@systemreboot.net>
AuthorDate: Wed Sep 8 16:24:10 2021 +0530

    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.
---
 gnu/packages/guile-xyz.scm | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm
index 5ce503e..b5e2b86 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