From fc80b21fd611a09aad02b2f37a85979578d6a50e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Thu, 24 Sep 2015 14:55:14 +0200
Subject: [PATCH] Fix my-env so it includes gcc, as it used to do.

This is a reaction to 1014620bcec75f07ee8836f517cf6aa7dd66b4c3, that
moved some paths from nix source to the builder.sh of stdenv.

(cherry picked from commit 263c13481cc19ee04079c8a75d0c58b74bbd8a0f)
---
 pkgs/misc/my-env/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/my-env/default.nix b/pkgs/misc/my-env/default.nix
index ce7813b237c..6599f44be3a 100644
--- a/pkgs/misc/my-env/default.nix
+++ b/pkgs/misc/my-env/default.nix
@@ -64,7 +64,7 @@
 mkDerivation {
   # The setup.sh script from stdenv will expect the native build inputs in
   # the nativeBuildInputs environment variable.
-  nativeBuildInputs = [ ] ++ buildInputs;
+  nativeBuildInputs = stdenv.defaultNativeBuildInputs ++ buildInputs;
   # Trick to bypass the stdenv usual change of propagatedBuildInputs => propagatedNativeBuildInputs
   propagatedBuildInputs2 = propagatedBuildInputs;
 
@@ -89,7 +89,7 @@ mkDerivation {
         "$setupNew" > "$s"
     cat >> "$out/dev-envs/''${name/env-/}" << EOF
       nativeBuildInputs="$nativeBuildInputs"
-      propagatedBuildInputs="$propagatedBuildInputs2"
+      propagatedNativeBuildInputs="$propagatedBuildInputs2"
       # the setup-new script wants to write some data to a temp file.. so just let it do that and tidy up afterwards
       tmp="\$("${pkgs.coreutils}/bin/mktemp" -d)"
       NIX_BUILD_TOP="\$tmp"