diff options
| author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-03-01 15:05:27 +0000 |
|---|---|---|
| committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-03-01 15:05:27 +0000 |
| commit | 84fb9ca331574f51bad33898016ca1bc60737fa7 (patch) | |
| tree | 6aad25ab1b7bdd2d7305b280607029ad305f5717 /pkgs/misc | |
| parent | 1cd24d18a302e3aac40a33c6deebfddd5e3443c1 (diff) | |
| parent | a75ccf7dca60c2a6a81c3dc8ac9e84f4143f87ac (diff) | |
svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/libpng15/; revision=32719
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" ''; } |