diff options
author | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2019-01-19 14:15:51 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-01-19 14:15:51 +0100 |
commit | d531da6f8ae7a8dab806bcd3211cd84d2d189d24 (patch) | |
tree | 5b4c5b9e34d2e1bfd02fb8ff26db876806007edc /pkgs/development/tools | |
parent | 4eca960cb4ed5e68b93d112fd90623a5a2bae433 (diff) | |
parent | bcf54ce5bbc8c325cfd2b6bcc5cec7661ef49183 (diff) | |
download | nixlib-d531da6f8ae7a8dab806bcd3211cd84d2d189d24.tar nixlib-d531da6f8ae7a8dab806bcd3211cd84d2d189d24.tar.gz nixlib-d531da6f8ae7a8dab806bcd3211cd84d2d189d24.tar.bz2 nixlib-d531da6f8ae7a8dab806bcd3211cd84d2d189d24.tar.lz nixlib-d531da6f8ae7a8dab806bcd3211cd84d2d189d24.tar.xz nixlib-d531da6f8ae7a8dab806bcd3211cd84d2d189d24.tar.zst nixlib-d531da6f8ae7a8dab806bcd3211cd84d2d189d24.zip |
Merge pull request #54094 from rnhmjoj/shell
treewide: use ${stdenv.shell} instead of /bin/sh where possible
Diffstat (limited to 'pkgs/development/tools')
-rw-r--r-- | pkgs/development/tools/misc/ctags/wrapped.nix | 2 | ||||
-rw-r--r-- | pkgs/development/tools/misc/distcc/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/tools/misc/opengrok/default.nix | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/tools/misc/ctags/wrapped.nix b/pkgs/development/tools/misc/ctags/wrapped.nix index 75ae9f1ba8b2..ed265b4489b3 100644 --- a/pkgs/development/tools/misc/ctags/wrapped.nix +++ b/pkgs/development/tools/misc/ctags/wrapped.nix @@ -14,7 +14,7 @@ with pkgs.stdenv.lib; # the derivation. use language extensions specified by args ctagsWrapped = makeOverridable ( {args, name} : pkgs.writeScriptBin name '' - #!/bin/sh + #!${stdenv.shell} exec ${pkgs.ctags}/bin/ctags ${concatStringsSep " " (map escapeShellArg args)} "$@" '') { args = let x = pkgs.ctagsWrapped; in concatLists [ diff --git a/pkgs/development/tools/misc/distcc/default.nix b/pkgs/development/tools/misc/distcc/default.nix index cef399eb5c12..e80a37d37dd5 100644 --- a/pkgs/development/tools/misc/distcc/default.nix +++ b/pkgs/development/tools/misc/distcc/default.nix @@ -53,7 +53,7 @@ let mkdir -p $out/bin if [ -x "${gcc.cc}/bin/gcc" ]; then cat > $out/bin/gcc << EOF - #!/bin/sh + #!${stdenv.shell} ${extraConfig} exec ${distcc}/bin/distcc gcc "\$@" EOF @@ -61,7 +61,7 @@ let fi if [ -x "${gcc.cc}/bin/g++" ]; then cat > $out/bin/g++ << EOF - #!/bin/sh + #!${stdenv.shell} ${extraConfig} exec ${distcc}/bin/distcc g++ "\$@" EOF diff --git a/pkgs/development/tools/misc/opengrok/default.nix b/pkgs/development/tools/misc/opengrok/default.nix index c8fdf246bcf1..f7b77cdc418d 100644 --- a/pkgs/development/tools/misc/opengrok/default.nix +++ b/pkgs/development/tools/misc/opengrok/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { mkdir -p $out cp -a * $out/ substituteInPlace $out/bin/OpenGrok --replace "/bin/uname" "${coreutils}/bin/uname" - substituteInPlace $out/bin/Messages --replace "#!/bin/ksh" "#!/bin/sh" + substituteInPlace $out/bin/Messages --replace "#!/bin/ksh" "#!${stdenv.shell}" wrapProgram $out/bin/OpenGrok \ --prefix PATH : "${stdenv.lib.makeBinPath [ ctags git ]}" \ --set JAVA_HOME "${jre}" \ |