From 63ffd27a6b0b6665e89c51f08cf06ab3c7bd474b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Wed, 9 Mar 2016 12:40:17 +0100
Subject: [PATCH] Fixing my-env to get NIX_CFLAGS_COMPILE and so on

Yes, I still use my-env. I tested that it works on 16.03.
---
 pkgs/misc/my-env/default.nix | 1 +
 pkgs/misc/my-env/loadenv.sh  | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/misc/my-env/default.nix b/pkgs/misc/my-env/default.nix
index ce7813b237c..5e94f6f7771 100644
--- a/pkgs/misc/my-env/default.nix
+++ b/pkgs/misc/my-env/default.nix
@@ -88,6 +88,7 @@ mkDerivation {
         -e '1i initialPath="${toString initialPath}"' \
         "$setupNew" > "$s"
     cat >> "$out/dev-envs/''${name/env-/}" << EOF
+      defaultNativeBuildInputs="$defaultNativeBuildInputs"
       nativeBuildInputs="$nativeBuildInputs"
       propagatedBuildInputs="$propagatedBuildInputs2"
       # the setup-new script wants to write some data to a temp file.. so just let it do that and tidy up afterwards
diff --git a/pkgs/misc/my-env/loadenv.sh b/pkgs/misc/my-env/loadenv.sh
index 2a990e8685c..816c1b8a711 100644
--- a/pkgs/misc/my-env/loadenv.sh
+++ b/pkgs/misc/my-env/loadenv.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!@shell@
 
 OLDPATH="$PATH"
 OLDTZ="$TZ"