From a543a57ab5758d174e6351938a73583091517273 Mon Sep 17 00:00:00 2001
From: "Nicolas B. Pierron" <nicolas.b.pierron@gmail.com>
Date: Sun, 20 Mar 2016 16:04:00 +0000
Subject: [PATCH] Reformat pkgsWithOverrides to later facilitate the
 identitication with the extend functions.

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 11987090806..769cae55406 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -113,13 +113,13 @@ let
   # function is very expensive!
   pkgsWithOverrides = overrider:
     let
-      overrides = super: overrider pkgs super // stdenvOverrides super;
-
       # The un-overriden packages, passed to `overrider'.
-      pkgs_ = pkgsFun pkgs;
+      pkgs_6 = pkgsFun pkgs;
+
+      pkgs_7 = pkgs_6 // overrider pkgs pkgs_6;
 
       # The overriden, final packages.
-      pkgs = pkgs_ // overrides pkgs_;
+      pkgs =   pkgs_7 // stdenvOverrides pkgs_6;
     in pkgs;
 
   # The package compositions.  Yes, this isn't properly indented.