diff --git a/pkgs/by-name/fi/fish/package.nix b/pkgs/by-name/fi/fish/package.nix index a0af663f595a..b4dcdc21337b 100644 --- a/pkgs/by-name/fi/fish/package.nix +++ b/pkgs/by-name/fi/fish/package.nix @@ -2,12 +2,14 @@ stdenv, lib, fetchFromGitHub, + buildPackages, coreutils, darwin, glibcLocales, gnused, gnugrep, gawk, + fish, man-db, ninja, getent, @@ -281,12 +283,19 @@ stdenv.mkDerivation (finalAttrs: { pkg-config rustc rustPlatform.cargoSetupHook - (python3.withPackages (ps: [ + (buildPackages.python3.withPackages (ps: [ ps.pexpect ps.sphinx ])) # Avoid warnings when building the manpages about HOME not being writable writableTmpDirAsHomeHook + ] + ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + # Building the docs ends up wanting to run fish_indent at build + # time, which obviously can't use a cross compiled fish_indent + # from this derivation. Pull in the build platform's fish to + # provide it. + fish ]; buildInputs = [