diff options
| author | Jonas Hoersch <coroa@online.de> | 2013-10-04 10:02:30 +0200 |
|---|---|---|
| committer | Evgeny Egorochkin <phreedom@yandex.ru> | 2013-10-21 20:58:40 +0300 |
| commit | a917b7b0112ddb8473bb27eae16f943ef63ba9f2 (patch) | |
| tree | 4b7921e832dc1cbded62a4bc73fa86e9595eefa6 | |
| parent | 6cb91c33d0a66fe66e8f23206795e55b65735c0c (diff) | |
| download | nixlib-a917b7b0112ddb8473bb27eae16f943ef63ba9f2.tar nixlib-a917b7b0112ddb8473bb27eae16f943ef63ba9f2.tar.gz nixlib-a917b7b0112ddb8473bb27eae16f943ef63ba9f2.tar.bz2 nixlib-a917b7b0112ddb8473bb27eae16f943ef63ba9f2.tar.lz nixlib-a917b7b0112ddb8473bb27eae16f943ef63ba9f2.tar.xz nixlib-a917b7b0112ddb8473bb27eae16f943ef63ba9f2.tar.zst nixlib-a917b7b0112ddb8473bb27eae16f943ef63ba9f2.zip | |
my-env: pull --norc shell flag out into shell parameter
As zsh's corresponding flag is called --no-rcs, the build environment couldn't be configured to use zsh at all. Even then the custom PS1 won't work on zsh, but it's usable enough. Close #1040.
| -rw-r--r-- | pkgs/misc/my-env/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/misc/my-env/loadenv.sh | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/misc/my-env/default.nix b/pkgs/misc/my-env/default.nix index ac2dc7f8cda5..1c0dc0cbfe9b 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 ? "" - , cleanupCmds ? "", shell ? "${pkgs.bashInteractive}/bin/bash"}: + , cleanupCmds ? "", shell ? "${pkgs.bashInteractive}/bin/bash --norc"}: mkDerivation { # The setup.sh script from stdenv will expect the native build inputs in @@ -146,8 +146,8 @@ mkDerivation { EOF mkdir -p $out/bin - sed -e s,@shell@,${shell}, -e s,@myenvpath@,$out/dev-envs/${name}, \ - -e s,@name@,${name}, ${./loadenv.sh} > $out/bin/load-env-${name} + sed -e 's,@shell@,${shell},' -e s,@myenvpath@,$out/dev-envs/${name}, \ + -e 's,@name@,${name},' ${./loadenv.sh} > $out/bin/load-env-${name} chmod +x $out/bin/load-env-${name} ''; } diff --git a/pkgs/misc/my-env/loadenv.sh b/pkgs/misc/my-env/loadenv.sh index 5d126f0c29bb..6752d1c03b5f 100644 --- a/pkgs/misc/my-env/loadenv.sh +++ b/pkgs/misc/my-env/loadenv.sh @@ -10,5 +10,5 @@ export buildInputs export NIX_STRIP_DEBUG=0 export TZ="$OLDTZ" -@shell@ --norc +@shell@ |