01/05: gnu: jami: Remove obsolete wrapper.

[guix-commits]

mbakke pushed a commit to branch master
in repository guix.

commit 12bcfcedb062c4ed89efd51da719df70e2f428b1
Author: Marius Bakke <address@hidden>
AuthorDate: Tue May 12 23:45:15 2020 +0200

    gnu: jami: Remove obsolete wrapper.
    
    * gnu/packages/jami.scm (jami)[inputs]: Change from
    SQLITE-WITH-COLUMN-METADATA to SQLITE.
    [arguments]: Remove 'wrap' phase.
---
 gnu/packages/jami.scm | 20 +-------------------
 1 file changed, 1 insertion(+), 19 deletions(-)

diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm
index dda787b..84f1d92 100644
--- a/gnu/packages/jami.scm
+++ b/gnu/packages/jami.scm
@@ -311,18 +311,7 @@ This package provides a library common to all Jami 
clients.")
        ("clutter-gtk" ,clutter-gtk)
        ("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)))
+       ("sqlite" ,sqlite)))
     (native-inputs
      `(("pkg-config" ,pkg-config)
        ("gettext" ,gettext-minimal)
@@ -339,13 +328,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/jami-gnome")
-                 `("LD_LIBRARY_PATH" ":" prefix (,path))))
              #t)))))
     (synopsis "Distributed, privacy-respecting communication program")
     (description "Jami (formerly GNU Ring) is a secure and distributed voice,