cross compilation: reduce emulation for evolution-data-server
This commit is contained in:
parent
454e02c8ec
commit
be1d8c5d97
|
@ -549,16 +549,20 @@ in
|
||||||
"-Dgtk_doc=${lib.boolToString (prev.stdenv.buildPlatform == prev.stdenv.hostPlatform)}"
|
"-Dgtk_doc=${lib.boolToString (prev.stdenv.buildPlatform == prev.stdenv.hostPlatform)}"
|
||||||
];
|
];
|
||||||
});
|
});
|
||||||
evolution-data-server = (super.evolution-data-server.override {
|
evolution-data-server = super.evolution-data-server.overrideAttrs (upstream: {
|
||||||
inherit (emulated) stdenv; # fixes aborts in "Performing Test _correct_iconv" &tc
|
# fixes aborts in "Performing Test _correct_iconv"
|
||||||
}).overrideAttrs (orig: {
|
cmakeFlags = upstream.cmakeFlags ++ [
|
||||||
nativeBuildInputs = orig.nativeBuildInputs ++ [
|
"-DCMAKE_CROSSCOMPILING_EMULATOR=${next.stdenv.hostPlatform.emulator next.buildPackages}"
|
||||||
next.perl # fixes "The 'perl' not found, not installing csv2vcard"
|
|
||||||
# next.glib
|
|
||||||
# next.libiconv
|
|
||||||
# next.iconv
|
|
||||||
];
|
];
|
||||||
# buildInputs = orig.buildInputs ++ [
|
# N.B.: the deps are funky even without cross compiling.
|
||||||
|
# upstream probably wants to replace pcre with pcre2, and maybe provide perl
|
||||||
|
# nativeBuildInputs = upstream.nativeBuildInputs ++ [
|
||||||
|
# next.perl # fixes "The 'perl' not found, not installing csv2vcard"
|
||||||
|
# # next.glib
|
||||||
|
# # next.libiconv
|
||||||
|
# # next.iconv
|
||||||
|
# ];
|
||||||
|
# buildInputs = upstream.buildInputs ++ [
|
||||||
# next.pcre2 # fixes: "Package 'libpcre2-8', required by 'glib-2.0', not found"
|
# next.pcre2 # fixes: "Package 'libpcre2-8', required by 'glib-2.0', not found"
|
||||||
# next.mount # fails to fix: "Package 'mount', required by 'gio-2.0', not found"
|
# next.mount # fails to fix: "Package 'mount', required by 'gio-2.0', not found"
|
||||||
# ];
|
# ];
|
||||||
|
|
Loading…
Reference in New Issue
Block a user