Move stdenvAdapaters attribute from all-packages.nix into the stdenvAdapters of the top-level.

1 files changed, 4 insertions, 2 deletions

diff --git a/pkgs/top-level/default.nix b/pkgs/top-level/default.nix
index 58b2a75f0d25..0e9f7ecf056f 100644
--- a/pkgs/top-level/default.nix
+++ b/pkgs/top-level/default.nix
@@ -114,14 +114,16 @@ let
   pkgsWithOverrides = overrider:
     let
       stdenvAdapters =
-        import ../stdenv/adapters.nix pkgs;
+        let res = import ../stdenv/adapters.nix pkgs; in res // {
+          stdenvAdapters = res;
+        };
 
       trivialBuilders =
         (import ../build-support/trivial-builders.nix { inherit lib; inherit (pkgs) stdenv; inherit (pkgs.xorg) lndir; });
 
       stdenvDefault = (import ./stdenv.nix topLevelArguments) {} pkgs;
 
-      selfArgs = topLevelArguments // { inherit pkgsWithOverrides stdenvAdapters; };
+      selfArgs = topLevelArguments // { inherit pkgsWithOverrides; };
       self = (import ./all-packages.nix selfArgs) self pkgs;
 
       aliases = import ./aliases.nix self;