From f7c86ee01841f85b94b3823f381119faf7060810 Mon Sep 17 00:00:00 2001
From: "Nicolas B. Pierron" <nicolas.b.pierron@gmail.com>
Date: Sun, 20 Mar 2016 13:47:31 +0000
Subject: [PATCH] Move merge of stdenvDefault from the self attribute to the
 returned value of pkgsFun.

---
 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 9cb6b371427..1d120339110 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -163,7 +163,7 @@ let
 
 };
 
-      self = with pkgs; stdenvDefault // {
+      self = with pkgs; {
 
   # Make some arguments passed to all-packages.nix available
   inherit system platform;
@@ -16480,7 +16480,7 @@ tweakAlias = _n: alias: with lib;
   else alias;
 
 in
-  lib.mapAttrs tweakAlias aliases // helperFunctions // self // overrides;
+  lib.mapAttrs tweakAlias aliases // helperFunctions // stdenvDefault // self // overrides;
 
 in
   pkgs