Author: eelco
Date: Tue Jul 5 14:38:31 2011
New Revision: 27611
URL: https://svn.nixos.org/websvn/nix/?rev=27611&sc=1
Log:
* ‘applyGlobalOverrides’ considered harmful. Getting rid of it in the
calls to KDE 4.5 and 4.6 cuts nix-env evaluation time (for ‘-qa
--drv-path *’) from 10.2s to 7.4s.
There are two other calls to ‘applyGlobalOverrides’, namely in
‘webkit’ and ‘webkitSVN’ for the libsoup override. We should get
rid of those too.
Modified:
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Tue Jul 5 13:55:41
2011 (r27610)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Tue Jul 5 14:38:31
2011 (r27611)
@@ -99,7 +99,8 @@
# Return the complete set of packages, after applying the overrides
- # returned by the `overrider' function (see above).
+ # returned by the `overrider' function (see above). Warning: this
+ # function is very expensive!
applyGlobalOverrides = overrider:
let
# Call the overrider function. We don't want stdenv overrides
@@ -4390,7 +4391,7 @@
gstPluginsGood;
inherit (p.xlibs) libXt renderproto libXrender;
});
-
+
wvstreams = callPackage ../development/libraries/wvstreams { };
wxGTK = wxGTK28;
@@ -7620,21 +7621,11 @@
kde4 = kde45;
kde45 = callPackage ../desktops/kde-4.5 {
- callPackage =
- let
- # !!! Ugly, inefficient.
- pkgs_for_45 = (applyGlobalOverrides (p: { kde4 = p.kde45; }));
- in
- pkgs_for_45.newScope pkgs_for_45.kde45;
+ callPackage = newScope pkgs.kde45;
};
-
+
kde46 = callPackage ../desktops/kde-4.6 {
- callPackage =
- let
- # !!! Ugly, inefficient.
- pkgs_for_46 = (applyGlobalOverrides (p: { kde4 = p.kde46; }));
- in
- pkgs_for_46.newScope pkgs_for_46.kde46;
+ callPackage = newScope pkgs.kde46;
};
redshift = callPackage ../applications/misc/redshift {
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
