From 4ff2e5d7e0c6337d46a1e089f9b653a19b9f7aa4 Mon Sep 17 00:00:00 2001 From: Dan Callaghan Date: Sun, 3 Jul 2022 22:29:30 +1000 Subject: [PATCH] restool: also depend on which 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 --- pkgs/os-specific/linux/restool/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/restool/default.nix b/pkgs/os-specific/linux/restool/default.nix index 83c7c93ffcd8..9b8ade24748c 100644 --- a/pkgs/os-specific/linux/restool/default.nix +++ b/pkgs/os-specific/linux/restool/default.nix @@ -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)"