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/tools/misc | |
| 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 possibleDiffstat (limited to 'pkgs/tools/misc')
| -rw-r--r-- | pkgs/tools/misc/fzf/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/misc/grub/2.0x.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/misc/grub/trusted.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/misc/qjoypad/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/misc/xfstests/default.nix | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix index a882fe9a9ba3..08efe3e6e18b 100644 --- a/pkgs/tools/misc/fzf/default.nix +++ b/pkgs/tools/misc/fzf/default.nix @@ -47,7 +47,7 @@ buildGoPackage rec { cp -R $src/shell $bin/share/fzf cat <<SCRIPT > $bin/bin/fzf-share - #!/bin/sh + #!${stdenv.shell} # Run this script to find the fzf shared folder where all the shell # integration scripts are living. echo $bin/share/fzf diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix index d50797508596..2a8734822ac7 100644 --- a/pkgs/tools/misc/grub/2.0x.nix +++ b/pkgs/tools/misc/grub/2.0x.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { preConfigure = '' for i in "tests/util/"*.in do - sed -i "$i" -e's|/bin/bash|/bin/sh|g' + sed -i "$i" -e's|/bin/bash|${stdenv.shell}|g' done # Apparently, the QEMU executable is no longer called diff --git a/pkgs/tools/misc/grub/trusted.nix b/pkgs/tools/misc/grub/trusted.nix index 94beff8dfe37..ca4e477adce7 100644 --- a/pkgs/tools/misc/grub/trusted.nix +++ b/pkgs/tools/misc/grub/trusted.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { preConfigure = '' for i in "tests/util/"*.in do - sed -i "$i" -e's|/bin/bash|/bin/sh|g' + sed -i "$i" -e's|/bin/bash|${stdenv.shell}|g' done # Apparently, the QEMU executable is no longer called diff --git a/pkgs/tools/misc/qjoypad/default.nix b/pkgs/tools/misc/qjoypad/default.nix index 4d91c184b0ae..4428bf1e625a 100644 --- a/pkgs/tools/misc/qjoypad/default.nix +++ b/pkgs/tools/misc/qjoypad/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = [ "-lX11" ]; patchPhase = '' cd src - substituteInPlace config --replace /bin/bash /bin/sh + substituteInPlace config --replace /bin/bash ${stdenv.shell} mkdir -p $out export NIX_LDFLAGS="$NIX_LDFLAGS -rpath ${libX11}/lib" ''; diff --git a/pkgs/tools/misc/xfstests/default.nix b/pkgs/tools/misc/xfstests/default.nix index e03f84355cad..7305013eb8b7 100644 --- a/pkgs/tools/misc/xfstests/default.nix +++ b/pkgs/tools/misc/xfstests/default.nix @@ -78,7 +78,7 @@ stdenv.mkDerivation { # wants to write temporary files there. So create a temporary # to run from and symlink the runtime files to it. wrapperScript = writeScript "xfstests-check" '' - #!/bin/sh + #!${stdenv.shell} set -e export RESULT_BASE="$(pwd)/results" |