From b5d5f0b7a7c271bc6efdeac8556410f1dbcee364 Mon Sep 17 00:00:00 2001 From: Nikita Pedorich Date: Thu, 15 May 2025 23:32:36 +0900 Subject: [PATCH] cockpit: use bashInteractive instead of which --- pkgs/by-name/co/cockpit/package.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/co/cockpit/package.nix b/pkgs/by-name/co/cockpit/package.nix index bc307ee5d9ed..a58a3ee4c2be 100644 --- a/pkgs/by-name/co/cockpit/package.nix +++ b/pkgs/by-name/co/cockpit/package.nix @@ -36,7 +36,6 @@ systemd, udev, xmlto, - which, }: stdenv.mkDerivation (finalAttrs: { @@ -67,7 +66,6 @@ stdenv.mkDerivation (finalAttrs: { python3Packages.setuptools systemd xmlto - which ]; buildInputs = [ @@ -81,6 +79,7 @@ stdenv.mkDerivation (finalAttrs: { udev python3Packages.pygobject3 python3Packages.pip + bashInteractive ]; postPatch = '' @@ -99,7 +98,7 @@ stdenv.mkDerivation (finalAttrs: { --replace-fail 'const char *cockpit_config_dirs[] = { PACKAGE_SYSCONF_DIR' 'const char *cockpit_config_dirs[] = { "/etc"' substituteInPlace src/**/*.c \ - --replace '"/bin/sh"' "\"$(which sh)\"" + --replace-quiet "/bin/sh" "${lib.getExe bashInteractive}" # instruct users with problems to create a nixpkgs issue instead of nagging upstream directly substituteInPlace configure.ac \