From 3f03f502ee612adfcb41c7e849b2a79eb5e949d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 3 Dec 2021 09:03:18 +0100 Subject: [PATCH] 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 bada1e866b..1685470ced 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -12703,10 +12703,15 @@ (define-public libgda 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 @@ (define-public libgda ("libsecret" ,libsecret) ("libxslt" ,libxslt) ("openssl" ,openssl) + ("sqlite" ,sqlite) ("vala" ,vala))) (native-inputs `(("autoconf" ,autoconf)