cockpit: use bashInteractive instead of which

This commit is contained in:
Nikita Pedorich
2025-05-16 09:02:28 +09:00
parent 4ea658947b
commit b5d5f0b7a7
+2 -3
View File
@@ -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 \