From d229f0050c4dc2ed16ea9bd0a0d8e43f3aba2fbf Mon Sep 17 00:00:00 2001 From: aszlig Date: Tue, 9 Dec 2014 09:52:31 +0100 Subject: [PATCH] tomahawk: Fix finding Phonon VLC backend. Using propagatedBuildInputs only works for environment.systemPackages but not for using nix-env, because on NixOS we already have a default QT_PLUGIN_PATH set there. The main reason why I'm using the VLC backend and not providing options for other Phonon backends is because it's recommended upstream and also will be directly used (via libvlc) in the upcoming 0.9 release. Signed-off-by: aszlig --- pkgs/applications/audio/tomahawk/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/tomahawk/default.nix b/pkgs/applications/audio/tomahawk/default.nix index d6699b16b704..7428bc8b8e36 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 +, quazip, sparsehash, taglib, websocketpp, makeWrapper , enableXMPP ? true, libjreen ? null , enableKDE ? false, kdelibs ? null @@ -30,11 +30,18 @@ in stdenv.mkDerivation rec { buildInputs = [ cmake pkgconfig attica boost gnutls libechonest liblastfm lucenepp phonon qca2 qjson qt4 qtkeychain quazipQt4 sparsehash taglib websocketpp + makeWrapper ] ++ stdenv.lib.optional enableXMPP libjreen ++ stdenv.lib.optional enableKDE kdelibs ++ stdenv.lib.optional enableTelepathy telepathy_qt; - propagatedBuildInputs = [ phonon_backend_vlc ]; + postInstall = let + pluginPath = "${phonon_backend_vlc}/lib/kde4/plugins"; + in '' + for i in "$out"/bin/*; do + wrapProgram "$i" --prefix QT_PLUGIN_PATH : "${pluginPath}" + done + ''; enableParallelBuilding = true;