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;