From 11a566b5bc9cb90619df16170f47c9acac8eb57d Mon Sep 17 00:00:00 2001
From: "Nicolas B. Pierron" <nicolas.b.pierron@gmail.com>
Date: Thu, 17 Mar 2016 20:19:44 +0000
Subject: [PATCH] Move 'with helperFunctions' above the set of all packages.

---
 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 4cc95221e30c..c5c4820b584e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -125,11 +125,10 @@ let
 
   # The package compositions.  Yes, this isn't properly indented.
   pkgsFun = pkgs: overrides:
-    with helperFunctions;
     let
       defaultScope = pkgs // pkgs.xorg;
       self = self_ // overrides;
-      self_ = with self; helperFunctions // {
+      self_ = with self; helperFunctions // (with helperFunctions; {
 
   # Make some arguments passed to all-packages.nix available
   inherit system platform;
@@ -16470,7 +16469,7 @@ let
 
   mg = callPackage ../applications/editors/mg { };
 
-}; # self_ =
+}); # self_ =
 
 
 aliases = import ./aliases.nix self;