From 267b8363695190f2d0834892b4b1159d7918d447 Mon Sep 17 00:00:00 2001 From: aszlig Date: Tue, 17 May 2016 04:08:44 +0200 Subject: pkgs/tomahawk: Don't propagate Qt libs to user env Just a small workaround for NixOS/nixpkgs#15498, because putting the Vuizvui version of Tomahawk into systemPackages will propagate Qt 5.5 into the system path, which in turn causes KDE initalization to dlopen() Qt 5.5 libraries while being linked against Qt 5.6 libraries. We currently can't link Tomahawk against Qt 5.6, because it depends on QtWebKit, so moving Tomahawk to Qt 5.6 is not an option yet until QtWebEngine is packaged. Signed-off-by: aszlig --- pkgs/tomahawk/default.nix | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'pkgs') diff --git a/pkgs/tomahawk/default.nix b/pkgs/tomahawk/default.nix index 7b2835b9..2b5e7946 100644 --- a/pkgs/tomahawk/default.nix +++ b/pkgs/tomahawk/default.nix @@ -80,6 +80,11 @@ in stdenv.mkDerivation rec { ++ stdenv.lib.optional enableKDE (useQT5 kdelibs) ++ stdenv.lib.optional enableTelepathy (useQT5 telepathy_qt); + # XXX: Workaround for NixOS/nixpkgs#15498 + preInstall = '' + propagatedUserEnvPkgs= + ''; + enableParallelBuilding = true; meta = with stdenv.lib; { -- cgit 1.4.1