01/01: gnu: ring-client-gnome: Fix sqlite startup error.

[guix-commits]

ambrevar pushed a commit to branch wip-ring
in repository guix.

commit d21e662117bc5456ab1b759249d2369e6e35fefb
Author: Pierre Neidhardt <address@hidden>
Date:   Thu Mar 14 19:33:33 2019 +0100

    gnu: ring-client-gnome: Fix sqlite startup error.
    
    * gnu/packages/telephony.scm (ring-client-gnome)[input]: Add
    sqlite-with-column-metadata.
    [arguments]: Fix sqlite startup error.
---
 gnu/packages/telephony.scm | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm
index 5596a9e..7af0989 100644
--- a/gnu/packages/telephony.scm
+++ b/gnu/packages/telephony.scm
@@ -60,6 +60,7 @@
   #: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)
@@ -867,7 +868,18 @@ This package provides a library common to all Ring 
clients.")
        ("clutter-gtk" ,clutter-gtk)
        ("gettext" ,gnu-gettext)
        ("libcanberra" ,libcanberra)
-       ("webkitgtk" ,webkitgtk)))
+       ("webkitgtk" ,webkitgtk)
+       ;; TODO: We must wrap ring-client-gnome to use
+       ;; sqlite-with-column-metadata or else it will fail 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
+       ;; ring-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)))
     (native-inputs
      `(("pkg-config" ,pkg-config)
        ("doxygen" ,doxygen)))
@@ -882,6 +894,16 @@ This package provides a library common to all Ring 
clients.")
          (add-after 'unpack 'change-directory
            (lambda _
              (chdir "client-gnome")
+             #t))
+         (add-after 'install 'wrap
+           (lambda* (#:key inputs outputs #:allow-other-keys)
+             ;; FIXME: Mesa tries to dlopen libudev.so.0 and fails.  Pending a
+             ;; fix of the mesa package we wrap the pcb executable such that
+             ;; Mesa can find libudev.so.0 through LD_LIBRARY_PATH.
+             (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 "Ring is a secure and distributed voice, video and chat