diff options
| -rw-r--r-- | pkgs/misc/my-env/default.nix | 9 | ||||
| -rw-r--r-- | pkgs/misc/my-env/loadenv.sh | 3 |
2 files changed, 10 insertions, 2 deletions
diff --git a/pkgs/misc/my-env/default.nix b/pkgs/misc/my-env/default.nix index e68e4cab3492..e89a8ebb230d 100644 --- a/pkgs/misc/my-env/default.nix +++ b/pkgs/misc/my-env/default.nix @@ -59,7 +59,7 @@ { mkDerivation, substituteAll, pkgs }: { stdenv ? pkgs.stdenv, name, buildInputs ? [] , propagatedBuildInputs ? [], gcc ? stdenv.gcc, cTags ? [], extraCmds ? "" - , shell ? "${pkgs.bashInteractive}/bin/bash"}: + , cleanupCmds ? "", shell ? "${pkgs.bashInteractive}/bin/bash"}: mkDerivation { # The setup.sh script from stdenv will expect the native build inputs in @@ -133,8 +133,15 @@ mkDerivation { fi rm -fr "\$tmp" ${extraCmds} + + nix_cleanup() { + ${cleanupCmds} + } + export PATH echo $name loaded + + trap nix_cleanup EXIT EOF mkdir -p $out/bin diff --git a/pkgs/misc/my-env/loadenv.sh b/pkgs/misc/my-env/loadenv.sh index c116c14d8fe6..5d126f0c29bb 100644 --- a/pkgs/misc/my-env/loadenv.sh +++ b/pkgs/misc/my-env/loadenv.sh @@ -10,4 +10,5 @@ export buildInputs export NIX_STRIP_DEBUG=0 export TZ="$OLDTZ" -exec @shell@ --norc +@shell@ --norc + |