From d9ba0ed9afac7b4974c47582549079d09dc9a3ab Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 10 Dec 2014 10:26:42 +0100 Subject: [PATCH] tomahawk: Fix resolver signature verification. Requires the OpenSSL QCA plugin, otherwise QCA is unable to load the Tomahawk public key. Signed-off-by: aszlig --- pkgs/applications/audio/tomahawk/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/tomahawk/default.nix b/pkgs/applications/audio/tomahawk/default.nix index 7428bc8b8e3..eb26e2b66c4 100644 --- a/pkgs/applications/audio/tomahawk/default.nix +++ b/pkgs/applications/audio/tomahawk/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, cmake, pkgconfig, attica, boost, gnutls, libechonest -, liblastfm, lucenepp, phonon, phonon_backend_vlc, qca2, qjson, qt4, qtkeychain -, quazip, sparsehash, taglib, websocketpp, makeWrapper +, liblastfm, lucenepp, phonon, phonon_backend_vlc, qca2, qca2_ossl, qjson, qt4 +, qtkeychain, quazip, sparsehash, taglib, websocketpp, makeWrapper , enableXMPP ? true, libjreen ? null , enableKDE ? false, kdelibs ? null @@ -36,7 +36,10 @@ in stdenv.mkDerivation rec { ++ stdenv.lib.optional enableTelepathy telepathy_qt; postInstall = let - pluginPath = "${phonon_backend_vlc}/lib/kde4/plugins"; + pluginPath = stdenv.lib.concatStringsSep ":" [ + "${phonon_backend_vlc}/lib/kde4/plugins" + "${qca2_ossl}/lib/qt4/plugins" + ]; in '' for i in "$out"/bin/*; do wrapProgram "$i" --prefix QT_PLUGIN_PATH : "${pluginPath}"