From ffcb6682bcc14f70c49949fdcbfbba8841c63e0c Mon Sep 17 00:00:00 2001
From: "Nicolas B. Pierron" <nicolas.b.pierron@gmail.com>
Date: Sat, 19 Mar 2016 14:02:20 +0000
Subject: [PATCH] Under pkgsFun, move the merge of helper functions from self_
 to self.

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 12ebed19f2d..5d21f1fd9e5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -121,7 +121,7 @@ let
   pkgsFun = pkgs: overrides:
     let
       defaultScope = pkgs // pkgs.xorg;
-      self = self_ // overrides;
+      self = helperFunctions // self_ // overrides;
 
       # Helper functions that are exported through `pkgs'.
       helperFunctions =
@@ -131,7 +131,7 @@ let
       stdenvAdapters =
         import ../stdenv/adapters.nix pkgs;
 
-      self_ = with self; helperFunctions // {
+      self_ = with self; {
 
   # Make some arguments passed to all-packages.nix available
   inherit system platform;