diff options
| author | Efraim Flashner <efraim@flashner.co.il> | 2019-11-28 15:12:49 +0200 |
|---|---|---|
| committer | Efraim Flashner <efraim@flashner.co.il> | 2019-11-28 15:17:42 +0200 |
| commit | fad5b1a6d8d9c36bea5785ae4fbc1beb37e644d7 (patch) | |
| tree | 4960615cda38f60ec658e5c1ad20c8dccb851344 /gnu/packages/telephony.scm | |
| parent | 8456f9fcd93034150460e7e950aa502db3cc3d38 (diff) | |
| download | guix-patches-fad5b1a6d8d9c36bea5785ae4fbc1beb37e644d7.tar guix-patches-fad5b1a6d8d9c36bea5785ae4fbc1beb37e644d7.tar.gz | |
gnu: sqlite: Build with column metadata.
* gnu/packages/sqlite.scm (sqlite)[arguments]: Add configure flag to
enable column metadata.
(sqlite-with-column-metadata): Remove variable.
* gnu/packages/fontutils.scm (fontmanager)[inputs]: Replace
sqlite-with-column-metadata with sqlite.
* gnu/packages/messaging (dino)[inputs]: Ditto.
* gnu/packages/music.scm (clementine)[inputs]: Ditto.
* gnu/packages/qt.scm (qtbase)[inputs]: Ditto.
* gnu/packages/telephony.scm (jami)[inputs]: Remove
sqlite-with-column-metadata.
[arguments]: Remove custom 'wrap phase.
Diffstat (limited to 'gnu/packages/telephony.scm')
| -rw-r--r-- | gnu/packages/telephony.scm | 22 |
1 files changed, 1 insertions, 21 deletions
diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm index abb68f62b2..21f00f51a1 100644 --- a/gnu/packages/telephony.scm +++ b/gnu/packages/telephony.scm @@ -60,7 +60,6 @@ #:use-module (gnu packages qt) #:use-module (gnu packages serialization) #:use-module (gnu packages speech) - #:use-module (gnu packages sqlite) #:use-module (gnu packages tls) #:use-module (gnu packages upnp) #:use-module (gnu packages video) @@ -858,19 +857,7 @@ This package provides a library common to all Jami clients.") ("clutter-gtk" ,clutter-gtk) ("gettext" ,gnu-gettext) ("libcanberra" ,libcanberra) - ("webkitgtk" ,webkitgtk) - ;; TODO: We must wrap ring-client-gnome to force using the - ;; `sqlite-with-column-metadata' package instead of `sqlite' or else it - ;; fails with: - ;; - ;; /gnu/store/...-qtbase-5.11.2/lib/qt5/plugins/sqldrivers/libqsqlite.so: - ;; undefined symbol: sqlite3_column_table_name16 - ;; - ;; qtbase is built against sqlite-with-column-metadata but somehow - ;; jami-client-gnome ends up with both `sqlite' and - ;; `sqlite-with-column-metadata' as inputs and it seems that - ;; libqsqlite.so gets confused. - ("sqlite" ,sqlite-with-column-metadata))) + ("webkitgtk" ,webkitgtk))) (native-inputs `(("pkg-config" ,pkg-config) ("glib:bin" ,glib "bin") @@ -886,13 +873,6 @@ This package provides a library common to all Jami clients.") (add-after 'unpack 'change-directory (lambda _ (chdir "client-gnome") - #t)) - (add-after 'install 'wrap - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (path (string-append (assoc-ref inputs "sqlite") "/lib"))) - (wrap-program (string-append out "/bin/gnome-ring") - `("LD_LIBRARY_PATH" ":" prefix (,path)))) #t))))) (synopsis "Distributed multimedia communications platform") (description "Jami (formerly GNU Ring) is a secure and distributed voice, |