From b3762cc221ff407502ae269c057707902ff9070c Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 1 Aug 2016 18:23:38 +0200 Subject: pkgs/tomahawk: Remove Qt propagation workaround This reverts commit 267b8363695190f2d0834892b4b1159d7918d447. Issue NixOS/nixpkgs#15498 is already fixed upstream, so this ugly workaround isn't needed anymore. Signed-off-by: aszlig --- pkgs/tomahawk/default.nix | 5 ----- 1 file changed, 5 deletions(-) (limited to 'pkgs/tomahawk') diff --git a/pkgs/tomahawk/default.nix b/pkgs/tomahawk/default.nix index 2b5e7946..7b2835b9 100644 --- a/pkgs/tomahawk/default.nix +++ b/pkgs/tomahawk/default.nix @@ -80,11 +80,6 @@ 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