fish: Cross compilation fixes (#519264)
This commit is contained in:
@@ -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 = [
|
||||
|
||||
Reference in New Issue
Block a user