From 71b2fd92b3be82291563699a94a795b8becd5a65 Mon Sep 17 00:00:00 2001
From: "Nicolas B. Pierron" <nicolas.b.pierron@gmail.com>
Date: Fri, 18 Mar 2016 20:56:40 +0000
Subject: [PATCH] Move mkOverrides under applyGlobalOverrides.

---
 pkgs/top-level/all-packages.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1798b120cd1..eb30c460d47 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -92,8 +92,6 @@ let
   # ... pkgs.foo ...").
   pkgs = applyGlobalOverrides pkgsInit (self: config.packageOverrides or (super: {}));
 
-  mkOverrides = pkgs: overrides: overrides // stdenvOverrides pkgs;
-
   # stdenvOverrides is used to avoid circular dependencies for building the
   # standard build environment. This mechanism use the override mechanism to
   # implement some staged compilation of the stdenv.
@@ -113,13 +111,14 @@ let
   # function is very expensive!
   applyGlobalOverrides = pkgsOrig: overrider:
     let
+      mkOverrides = pkgs: overrides: overrides // stdenvOverrides pkgs;
+
       overrides = mkOverrides pkgsOrig (overrider pkgs pkgsOrig);
 
       # The overriden, final packages.
       pkgs = pkgsFun pkgs overrides;
     in pkgs;
 
-
   # The package compositions.  Yes, this isn't properly indented.
   pkgsFun = pkgs: overrides:
     let