me
/
guix
Archived
1
0
Fork 0
Code

gnu: jami: Remove obsolete wrapper. 

* gnu/packages/jami.scm (jami)[inputs]: Change from
SQLITE-WITH-COLUMN-METADATA to SQLITE.
[arguments]: Remove 'wrap' phase.
master
Marius Bakke 2020-05-12 23:45:15 +02:00
parent 0be56073b5
commit 12bcfcedb0
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
1 changed files with 1 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
gnu/packages/jami.scm
View File

@ -311,18 +311,7 @@ This package provides a library common to all Jami clients.")
("clutter-gtk" ,clutter-gtk) ("clutter-gtk" ,clutter-gtk)
("libcanberra" ,libcanberra) ("libcanberra" ,libcanberra)
("webkitgtk" ,webkitgtk) ("webkitgtk" ,webkitgtk)
;; TODO: We must wrap ring-client-gnome to force using the ("sqlite" ,sqlite)))
;; `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)))
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config) `(("pkg-config" ,pkg-config)
("gettext" ,gettext-minimal) ("gettext" ,gettext-minimal)
@ -339,13 +328,6 @@ This package provides a library common to all Jami clients.")
(add-after 'unpack 'change-directory (add-after 'unpack 'change-directory
(lambda _ (lambda _
(chdir "client-gnome") (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))))) #t)))))
(synopsis "Distributed, privacy-respecting communication program") (synopsis "Distributed, privacy-respecting communication program")
(description "Jami (formerly GNU Ring) is a secure and distributed voice, (description "Jami (formerly GNU Ring) is a secure and distributed voice,