colin/nix-files
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

cross compilation: reduce emulation for evolution-data-server

Browse Source
This commit is contained in:
Colin 2023-03-04 23:12:24 +00:00
parent 454e02c8ec
commit be1d8c5d97
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
hosts/common/cross/default.nix
View File

@ -549,16 +549,20 @@ in
"-Dgtk_doc=${lib.boolToString (prev.stdenv.buildPlatform == prev.stdenv.hostPlatform)}"
];
});
evolution-data-server = (super.evolution-data-server.override {
inherit (emulated) stdenv; # fixes aborts in "Performing Test _correct_iconv" &tc
}).overrideAttrs (orig: {
nativeBuildInputs = orig.nativeBuildInputs ++ [
next.perl # fixes "The 'perl' not found, not installing csv2vcard"
# next.glib
# next.libiconv
# next.iconv
evolution-data-server = super.evolution-data-server.overrideAttrs (upstream: {
# fixes aborts in "Performing Test _correct_iconv"
cmakeFlags = upstream.cmakeFlags ++ [
"-DCMAKE_CROSSCOMPILING_EMULATOR=${next.stdenv.hostPlatform.emulator next.buildPackages}"
];
# 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.mount # fails to fix: "Package 'mount', required by 'gio-2.0', not found"
# ];