diff options
| author | rht <rhtbot@gmail.com> | 2017-01-15 16:44:52 +0400 |
|---|---|---|
| committer | Michael Raskin <7c6f434c@mail.ru> | 2017-04-30 17:01:07 +0200 |
| commit | 5628cebcf0bd8f36c7d87b2cfa7b6b07768abc08 (patch) | |
| tree | 5ed17e7d53f9c0250c900e563ea416a6b8ffdbed /pkgs/build-support | |
| parent | 83129a6eed23007eaf57c515e9c3bc2191646dc7 (diff) | |
/bin/sh -> ${stdenv.shell}
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/docker/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/build-support/release/ant-build.nix | 2 | ||||
| -rw-r--r-- | pkgs/build-support/vm/windows/default.nix | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index 7f63664dadd02..6bc9b7475e1a6 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -82,7 +82,7 @@ rec { export PATH=${shadow}/bin:$PATH mkdir -p /etc/pam.d if [[ ! -f /etc/passwd ]]; then - echo "root:x:0:0::/root:/bin/sh" > /etc/passwd + echo "root:x:0:0::/root:${stdenv.shell}" > /etc/passwd echo "root:!x:::::::" > /etc/shadow fi if [[ ! -f /etc/group ]]; then diff --git a/pkgs/build-support/release/ant-build.nix b/pkgs/build-support/release/ant-build.nix index c77db30a81cec..5ab24132290ac 100644 --- a/pkgs/build-support/release/ant-build.nix +++ b/pkgs/build-support/release/ant-build.nix @@ -69,7 +69,7 @@ stdenv.mkDerivation ( mkdir -p $out/bin cat >> $out/bin/${w.name} <<EOF - #! /bin/sh + #!${stdenv.shell} export JAVA_HOME=$jre $jre/bin/java ${cp w} ${if w ? mainClass then w.mainClass else "-jar ${w.jar}"} \$@ EOF diff --git a/pkgs/build-support/vm/windows/default.nix b/pkgs/build-support/vm/windows/default.nix index c668e7569a44b..f157521998222 100644 --- a/pkgs/build-support/vm/windows/default.nix +++ b/pkgs/build-support/vm/windows/default.nix @@ -1,3 +1,4 @@ +#note: the hardcoded /bin/sh is required for the VM's cygwin shell pkgs: let |