cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

restool: also depend on which

Browse source 
The ls-main script uses `which`. It also has /bin/sh as its shebang,
which means bash runs in Bourne-compatible mode and `which` is not a
builtin.

When the ls-* scripts are invoked from a user shell you don't notice
the problem, because /run/current-system/sw/bin/which is on $PATH, but
when they are invoked in a systemd service it would fail:

  .../bin/ls-addni: line 1054: which: command not found
This commit is contained in:
Dan Callaghan 2022-07-03 22:29:30 +10:00
parent 09bcb880ce
commit 4ff2e5d7e0
No known key found for this signature in database
GPG key ID: 26B5AA2FDAF2F30A
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/os-specific/linux/restool/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, lib, fetchgit, bash, coreutils, dtc, file, gawk, gnugrep, gnused }:
{ stdenv, lib, fetchgit, bash, coreutils, dtc, file, gawk, gnugrep, gnused, which }:
stdenv.mkDerivation rec {
pname = "restool";
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ file ];
buildInputs = [ bash coreutils dtc gawk gnugrep gnused ];
buildInputs = [ bash coreutils dtc gawk gnugrep gnused which ];
makeFlags = [
"prefix=$(out)"