diff options
| author | aszlig <aszlig@redmoonstudios.org> | 2016-05-17 04:08:44 +0200 |
|---|---|---|
| committer | aszlig <aszlig@redmoonstudios.org> | 2016-05-17 04:08:44 +0200 |
| commit | 267b8363695190f2d0834892b4b1159d7918d447 (patch) | |
| tree | 5ecb058d1ad6ba81586e41cecc128711166647e2 /pkgs | |
| parent | 4130bb50b0ab96e305460722e1e8293e67061659 (diff) | |
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 <aszlig@redmoonstudios.org>
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/tomahawk/default.nix | 5 |
1 files changed, 5 insertions, 0 deletions
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; { |