diff options
author | Arie Middelkoop <amiddelk@gmail.com> | 2012-02-29 12:55:51 +0000 |
---|---|---|
committer | Arie Middelkoop <amiddelk@gmail.com> | 2012-02-29 12:55:51 +0000 |
commit | 298f4df4afb5c60bd686f13763ea6e2d0a7080ed (patch) | |
tree | 564775acab42f4b06b475adf2ae872491db8feea /pkgs/misc | |
parent | 45120513fb73699a0bbeccf26e61d86bad1868d3 (diff) |
Changed 'myEnvFun' to in addition put a script in 'bin' so that you can run '. load-<name>-env' to load your environment.
svn path=/nixpkgs/trunk/; revision=32690
Diffstat (limited to 'pkgs/misc')
-rw-r--r-- | pkgs/misc/my-env/default.nix | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/pkgs/misc/my-env/default.nix b/pkgs/misc/my-env/default.nix index 76080d8e114a3..8485346e67b9f 100644 --- a/pkgs/misc/my-env/default.nix +++ b/pkgs/misc/my-env/default.nix @@ -45,7 +45,7 @@ mkDerivation { # the buildNativeInputs environment variable. buildNativeInputs = [ ] ++ buildInputs ; name = "env-${name}"; - phases = [ "buildPhase" ]; + phases = [ "buildPhase" "fixupPhase" ]; setupNew = substituteAll { src = ../../stdenv/generic/setup.sh; preHook=""; @@ -56,7 +56,7 @@ mkDerivation { buildPhase = '' set -x - mkdir -p "$out/dev-envs" "$out/nix-support" + mkdir -p "$out/dev-envs" "$out/nix-support" "$out/bin" s="$out/nix-support/setup-new-modified" cp "$setupNew" "$s" # shut some warning up.., do not use set -e @@ -111,6 +111,12 @@ mkDerivation { export PATH echo $name loaded EOF - exit 0 + + cat >> "$out/bin/load-''${name/env-/}-env" << EOF + #!/bin/sh + + source "$out/dev-envs/''${name/env-/}" + EOF + chmod +x "$out/bin/load-''${name/env-/}-env" ''; } |