Force stdenv2 in kde4 scope

svn path=/nixpkgs/trunk/; revision=24090
This commit is contained in:
Yury G. Kudryashov
2010-10-05 17:44:11 +00:00
parent 739f82a526
commit d7d8f7d64f
3 changed files with 5 additions and 9 deletions

View File

@@ -5791,9 +5791,7 @@ let
jwm = callPackage ../applications/window-managers/jwm { };
kadu = newScope pkgs.kde45 ../applications/networking/instant-messengers/kadu {
stdenv = stdenv2;
};
kadu = newScope pkgs.kde45 ../applications/networking/instant-messengers/kadu { };
kbluetooth = newScope pkgs.kde4 ../tools/bluetooth/kbluetooth { };
@@ -6687,8 +6685,8 @@ let
inherit (pkgs.kde45) qt4 kdelibs;
};
shared_desktop_ontologies = pkgs.shared_desktop_ontologies.override { v = "0.5"; };
stdenv = pkgs.stdenv2;
} // pkgs.kde45);
stdenv = pkgs.stdenv2;
};
xfce = xfce4;