01/04: gnu: libgda: Do not use the bundled sqlite.

[guix-commits]

civodul pushed a commit to branch core-updates-frozen
in repository guix.

commit 3f03f502ee612adfcb41c7e849b2a79eb5e949d3
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Fri Dec 3 09:03:18 2021 +0100

    gnu: libgda: Do not use the bundled sqlite.
    
    * gnu/packages/gnome.scm (libgda)[source]: Add snippet.
    [arguments]: Pass "--enable-system-sqlite".
    [inputs]: Add SQLITE.
---
 gnu/packages/gnome.scm | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index bada1e8..1685470 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -12703,10 +12703,15 @@ developed with the aim of being used with the Librem 
5 phone.")
                                                version "." "_")))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "18rg773gq9v3cdywpmrp12c5xyp97ir9yqjinccpi22sksb1kl8a"))))
+        (base32 "18rg773gq9v3cdywpmrp12c5xyp97ir9yqjinccpi22sksb1kl8a"))
+       (modules '((guix build utils)))
+       (snippet
+        ;; Remove the bundled sqlite, but keep its header because code relies
+        ;; on this header variant.
+        '(delete-file "libgda/sqlite/sqlite-src/sqlite3.c"))))
     (build-system gnu-build-system)
     (arguments
-     `(#:configure-flags '("--enable-vala")
+     `(#:configure-flags '("--enable-system-sqlite" "--enable-vala")
        ;; There's a race between check_cnc_lock and check_threaded_cnc
        ;; in tests/multi-threading.
        #:parallel-tests? #f
@@ -12745,6 +12750,7 @@ developed with the aim of being used with the Librem 5 
phone.")
        ("libsecret" ,libsecret)
        ("libxslt" ,libxslt)
        ("openssl" ,openssl)
+       ("sqlite" ,sqlite)
        ("vala" ,vala)))
     (native-inputs
      `(("autoconf" ,autoconf)