From 335a969d458e72a4f9049f247ea33dde8cb10630 Mon Sep 17 00:00:00 2001
From: "Nicolas B. Pierron" <nicolas.b.pierron@gmail.com>
Date: Sun, 20 Mar 2016 16:33:46 +0000
Subject: [PATCH] Inline pkgsFun in pkgsWithOverrides.

---
 pkgs/top-level/default.nix | 21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/pkgs/top-level/default.nix b/pkgs/top-level/default.nix
index 39626a7485f7..135ec2a49d29 100644
--- a/pkgs/top-level/default.nix
+++ b/pkgs/top-level/default.nix
@@ -112,18 +112,6 @@ let
   # returned by the `overrider' function (see above).  Warning: this
   # function is very expensive!
   pkgsWithOverrides = overrider:
-    let
-      # The un-overriden packages, passed to `overrider'.
-      pkgs_6 = pkgsFun pkgs;
-
-      pkgs_7 = pkgs_6 // overrider pkgs pkgs_6;
-
-      # The overriden, final packages.
-      pkgs =   pkgs_7 // stdenvOverrides pkgs_6;
-    in pkgs;
-
-  # The package compositions.  Yes, this isn't properly indented.
-  pkgsFun = pkgs:
     let
       # Helper functions that are exported through `pkgs'.
       helperFunctions =
@@ -140,8 +128,13 @@ let
 
       aliases = import ./aliases.nix self;
 
-     in
-       helperFunctions // stdenvDefault // self // aliases;
+      pkgs_6 = helperFunctions // stdenvDefault // self // aliases;
+
+      pkgs_7 = pkgs_6 // overrider pkgs pkgs_6;
+
+      # The overriden, final packages.
+      pkgs =   pkgs_7 // stdenvOverrides pkgs_6;
+    in pkgs;
 
 in
   pkgs