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 | |
parent | 83129a6eed23007eaf57c515e9c3bc2191646dc7 (diff) |
/bin/sh -> ${stdenv.shell}
-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 | ||||
-rw-r--r-- | pkgs/servers/nosql/eventstore/default.nix | 2 | ||||
-rw-r--r-- | pkgs/servers/xmpp/pyIRCt/default.nix | 2 | ||||
-rw-r--r-- | pkgs/servers/xmpp/pyMAILt/default.nix | 2 |
6 files changed, 6 insertions, 5 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 diff --git a/pkgs/servers/nosql/eventstore/default.nix b/pkgs/servers/nosql/eventstore/default.nix index d58005f7be2b0..572cfe1f17d6e 100644 --- a/pkgs/servers/nosql/eventstore/default.nix +++ b/pkgs/servers/nosql/eventstore/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { mkdir -p $out/{bin,lib/eventstore/clusternode} cp -r bin/clusternode/* $out/lib/eventstore/clusternode/ cat > $out/bin/clusternode << EOF - #!/bin/sh + #!${stdenv.shell} exec ${mono}/bin/mono $out/lib/eventstore/clusternode/EventStore.ClusterNode.exe "\$@" EOF chmod +x $out/bin/clusternode diff --git a/pkgs/servers/xmpp/pyIRCt/default.nix b/pkgs/servers/xmpp/pyIRCt/default.nix index 2a87eeb7cb5a5..ebdc73aec30aa 100644 --- a/pkgs/servers/xmpp/pyIRCt/default.nix +++ b/pkgs/servers/xmpp/pyIRCt/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { sed -e '/configFiles/iimport os' -i config.py cp * $out/share/${name} cat > $out/bin/pyIRCt <<EOF - #! /bin/sh + #!${stdenv.shell} cd $out/share/${name} ./irc.py \"$@\" EOF diff --git a/pkgs/servers/xmpp/pyMAILt/default.nix b/pkgs/servers/xmpp/pyMAILt/default.nix index deb8b8ce7d1de..aeed7484f82ee 100644 --- a/pkgs/servers/xmpp/pyMAILt/default.nix +++ b/pkgs/servers/xmpp/pyMAILt/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { sed -e '/configFiles/iimport os' -i config.py cp * $out/share/$name cat > $out/bin/pyMAILt <<EOF - #! /bin/sh + #!${stdenv.shell} cd $out/share/${name} ./mail.py \"$@\" EOF |