ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-09-23 05:37:27 +03:00
Code Issues Projects Releases Wiki Activity

Force stdenv2 in kde4 scope

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/desktops/kde-4.4/default.nix
View File

@ -1,7 +1,7 @@
pkgs: pkgs:
pkgs.recurseIntoAttrs (rec { pkgs.recurseIntoAttrs (rec {
inherit (pkgs) qt4; inherit (pkgs) qt4 stdenv;
### SUPPORT ### SUPPORT
automoc4 = import ./support/automoc4 { automoc4 = import ./support/automoc4 {

6
pkgs/desktops/kde-4.5/default.nix
View File

@ -3,15 +3,13 @@
{ {
recurseForRelease = true; recurseForRelease = true;
inherit callPackage; inherit callPackage stdenv;
qt4 = qt47; qt4 = qt47;
phonon = null; phonon = null;
kde = import ./kde-package { kde = callPackage ./kde-package { };
inherit stdenv fetchurl;
};
### SUPPORT ### SUPPORT
akonadi = callPackage ./support/akonadi { }; akonadi = callPackage ./support/akonadi { };

6
pkgs/top-level/all-packages.nix
View File

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