From a8374f2168e4ad6dda41ae6457feac69614e271b Mon Sep 17 00:00:00 2001
From: "Nicolas B. Pierron" <nicolas.b.pierron@gmail.com>
Date: Fri, 18 Mar 2016 20:58:24 +0000
Subject: [PATCH] Under applyGlobalOverrides, inline mkOverrides in overrides.

---
 pkgs/top-level/all-packages.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index eb30c460d475..5f27f94b44c9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -111,9 +111,7 @@ let
   # function is very expensive!
   applyGlobalOverrides = pkgsOrig: overrider:
     let
-      mkOverrides = pkgs: overrides: overrides // stdenvOverrides pkgs;
-
-      overrides = mkOverrides pkgsOrig (overrider pkgs pkgsOrig);
+      overrides = overrider pkgs pkgsOrig // stdenvOverrides pkgsOrig;
 
       # The overriden, final packages.
       pkgs = pkgsFun pkgs overrides;