From 01693ac154138e95324959d260056312021e0dae Mon Sep 17 00:00:00 2001
From: "Nicolas B. Pierron" <nicolas.b.pierron@gmail.com>
Date: Sun, 20 Mar 2016 17:50:06 +0000
Subject: [PATCH] Move stdenvAdapaters attribute from all-packages.nix into the
 stdenvAdapters of the top-level.

---
 pkgs/top-level/all-packages.nix | 4 ++--
 pkgs/top-level/default.nix      | 6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e8b659586c2..14e87053387 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1,6 +1,6 @@
 { system, bootStdenv, noSysDirs, gccWithCC, gccWithProfiling
 , config, crossSystem, platform, lib
-, pkgsWithOverrides, stdenvAdapters
+, pkgsWithOverrides
 , ... }:
 self: pkgs:
 
@@ -74,7 +74,7 @@ in
 
 
   ### Helper functions.
-  inherit lib config stdenvAdapters;
+  inherit lib config;
 
   inherit (lib) lowPrio hiPrio appendToName makeOverridable;
   inherit (misc) versionedDerivation;
diff --git a/pkgs/top-level/default.nix b/pkgs/top-level/default.nix
index 58b2a75f0d2..0e9f7ecf056 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;