summaryrefslogtreecommitdiff
path: root/gnu/packages/messaging.scm
diff options
context:
space:
mode:
authorMarius Bakke <mbakke@fastmail.com>2018-03-18 01:09:25 +0100
committerMarius Bakke <mbakke@fastmail.com>2018-03-18 01:09:25 +0100
commit7ace97395feedc4b3ec23be65f2ed63f29aac9a9 (patch)
tree768956fa30fc7b21e4e4715eafbb10dab32b2847 /gnu/packages/messaging.scm
parenta248a9ac6a67213b177ab5ba9ec270638c9dd002 (diff)
parentbe5ed142135e939cd23fcfe88c553fd28b32ac53 (diff)
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/messaging.scm')
-rw-r--r--gnu/packages/messaging.scm24
1 files changed, 16 insertions, 8 deletions
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index b6323c39b2..6ce8b258bb 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -144,9 +144,9 @@ keys, no previous conversation is compromised.")
#:configure-flags '("-DBUILD_SHARED_LIBS=on" "-DBUILD_TESTING=1")))
(build-system cmake-build-system)
(inputs `( ;; Required for tests:
- ("check", check)
- ("openssl", openssl)))
- (native-inputs `(("pkg-config", pkg-config)))
+ ("check" ,check)
+ ("openssl" ,openssl)))
+ (native-inputs `(("pkg-config" ,pkg-config)))
(home-page "https://github.com/WhisperSystems/libsignal-protocol-c")
(synopsis "Implementation of a ratcheting forward secrecy protocol")
(description "libsignal-protocol-c is an implementation of a ratcheting
@@ -613,8 +613,8 @@ end-to-end encryption support; XML console.")
(assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap)))))
(inputs
`(("libgee" ,libgee)
- ("libsignal-protocol-c", libsignal-protocol-c)
- ("libgcrypt", libgcrypt)
+ ("libsignal-protocol-c" ,libsignal-protocol-c)
+ ("libgcrypt" ,libgcrypt)
("libsoup" ,libsoup)
("sqlite" ,sqlite)
("gpgme" ,gpgme)
@@ -623,7 +623,7 @@ end-to-end encryption support; XML console.")
("gsettings-desktop-schemas" ,gsettings-desktop-schemas)))
(native-inputs
`(("pkg-config" ,pkg-config)
- ("libsignal-protocol-c-source", (package-source libsignal-protocol-c))
+ ("libsignal-protocol-c-source" ,(package-source libsignal-protocol-c))
("glib" ,glib "bin")
("vala" ,vala)
("gettext" ,gettext-minimal)))
@@ -874,10 +874,18 @@ instant messenger with audio and video chat capabilities.")
(("__DATE__") "\"\"")
(("__TIME__") "\"\"")
(("TIMESTAMP") "\"\""))
- #t)))))
+ #t))
+ ;; Ensure that icons are found at runtime.
+ (add-after 'install 'wrap-executable
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (let ((out (assoc-ref outputs "out")))
+ (wrap-program (string-append out "/bin/qtox")
+ `("QT_PLUGIN_PATH" prefix
+ ,(list (string-append (assoc-ref inputs "qtsvg")
+ "/lib/qt5/plugins/"))))))))))
(inputs
`(("ffmpeg" ,ffmpeg)
- ("filteraudio", filteraudio)
+ ("filteraudio" ,filteraudio)
("glib" ,glib)
("gtk+" ,gtk+-2)
("libsodium" ,libsodium)