From 79e528d7b2cea64b6999cc778bc75466bc5e3ec1 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 5 Jul 2011 14:38:31 +0000
Subject: [PATCH] =?UTF-8?q?*=20=E2=80=98applyGlobalOverrides=E2=80=99=20co?=
 =?UTF-8?q?nsidered=20harmful.=20=20Getting=20rid=20of=20it=20in=20the=20?=
 =?UTF-8?q?=20=20calls=20to=20KDE=204.5=20and=204.6=20cuts=20nix-env=20eva?=
 =?UTF-8?q?luation=20time=20(for=20=E2=80=98-qa=20=20=20--drv-path=20*?=
 =?UTF-8?q?=E2=80=99)=20from=2010.2s=20to=207.4s.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

  There are two other calls to ‘applyGlobalOverrides’, namely in
  ‘webkit’ and ‘webkitSVN’ for the libsoup override.  We should get
  rid of those too.

svn path=/nixpkgs/trunk/; revision=27611
---
 pkgs/top-level/all-packages.nix | 21 ++++++---------------
 1 file changed, 6 insertions(+), 15 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f8e8aa8f5dfd..52b91c7a4e66 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -99,7 +99,8 @@ let
 
 
   # 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 @@ let
         gstPluginsGood;
       inherit (p.xlibs) libXt renderproto libXrender;
     });
-
+    
   wvstreams = callPackage ../development/libraries/wvstreams { };
 
   wxGTK = wxGTK28;
@@ -7620,21 +7621,11 @@ let
   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 {