Skip to content

Commit 2cf3e0b

Browse files
authored
cockpit: use bashInteractive instead of which (#407372)
2 parents 0ca4e5f + b5d5f0b commit 2cf3e0b

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

pkgs/by-name/co/cockpit/package.nix

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
systemd,
3737
udev,
3838
xmlto,
39-
which,
4039
}:
4140

4241
stdenv.mkDerivation (finalAttrs: {
@@ -67,7 +66,6 @@ stdenv.mkDerivation (finalAttrs: {
6766
python3Packages.setuptools
6867
systemd
6968
xmlto
70-
which
7169
];
7270

7371
buildInputs = [
@@ -81,6 +79,7 @@ stdenv.mkDerivation (finalAttrs: {
8179
udev
8280
python3Packages.pygobject3
8381
python3Packages.pip
82+
bashInteractive
8483
];
8584

8685
postPatch = ''
@@ -99,7 +98,7 @@ stdenv.mkDerivation (finalAttrs: {
9998
--replace-fail 'const char *cockpit_config_dirs[] = { PACKAGE_SYSCONF_DIR' 'const char *cockpit_config_dirs[] = { "/etc"'
10099
101100
substituteInPlace src/**/*.c \
102-
--replace '"/bin/sh"' "\"$(which sh)\""
101+
--replace-quiet "/bin/sh" "${lib.getExe bashInteractive}"
103102
104103
# instruct users with problems to create a nixpkgs issue instead of nagging upstream directly
105104
substituteInPlace configure.ac \

0 commit comments

Comments
 (0)