Unverified Commit 2cf3e0b3 authored by Aleksana's avatar Aleksana Committed by GitHub
Browse files

cockpit: use bashInteractive instead of which (#407372)

parents 0ca4e5f0 b5d5f0b7

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

+2 −3
Original line number Diff line number Diff line
@@ -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 \