diff options
| author | Lluís Batlle i Rossell <viric@viric.name> | 2016-03-09 12:40:17 +0100 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@viric.name> | 2016-03-09 12:44:29 +0100 |
| commit | 63ffd27a6b0b6665e89c51f08cf06ab3c7bd474b (patch) | |
| tree | cefc779f3c3b4949c978b827bbb776be484c280b /pkgs/misc/my-env | |
| parent | 64d5af4663a39a85e598a02754f5b6a4c371d806 (diff) | |
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.
Diffstat (limited to 'pkgs/misc/my-env')
| -rw-r--r-- | pkgs/misc/my-env/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/misc/my-env/loadenv.sh | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/misc/my-env/default.nix b/pkgs/misc/my-env/default.nix index ce7813b237cb..5e94f6f7771c 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 2a990e8685c3..816c1b8a7111 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" |