mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-25 16:33:15 +00:00
/bin/sh -> ${stdenv.shell}
This commit is contained in:
parent
83129a6eed
commit
5628cebcf0
@ -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
|
||||
|
@ -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
|
||||
|
@ -1,3 +1,4 @@
|
||||
#note: the hardcoded /bin/sh is required for the VM's cygwin shell
|
||||
pkgs:
|
||||
|
||||
let
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user