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

cross compilation: get evolution-data-server to cross compile

Browse Source
This commit is contained in:
Colin 2023-02-27 21:29:55 +00:00
parent 503f097272
commit 0abbd006fc
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
hosts/common/cross.nix
View File

@ -434,7 +434,6 @@ in
gnome = prev.gnome.overrideScope' (self: super: { gnome = prev.gnome.overrideScope' (self: super: {
inherit (emulated.gnome) inherit (emulated.gnome)
evolution-data-server # "The 'perl' not found, not installing csv2vcard"
gnome-shell # "meson.build:128:0: ERROR: Program 'gjs' not found or not executable" gnome-shell # "meson.build:128:0: ERROR: Program 'gjs' not found or not executable"
; ;
# dconf-editor = super.dconf-editor.override { # dconf-editor = super.dconf-editor.override {
@ -457,14 +456,21 @@ 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.override {
# inherit (next) stdenv; inherit (emulated) stdenv; # fixes aborts in "Performing Test _correct_iconv" &tc
# }; }).overrideAttrs (orig: {
# evolution-data-server = super.evolution-data-server.overrideAttrs (orig: { nativeBuildInputs = orig.nativeBuildInputs ++ [
# # fixes "The 'perl' not found, not installing csv2vcard" next.perl # fixes "The 'perl' not found, not installing csv2vcard"
# # doesn't fix "CMake Error: try_run() invoked in cross-compiling mode, please set the following cache variables appropriately" # next.glib
# nativeBuildInputs = orig.nativeBuildInputs ++ [ next.perl ]; # next.libiconv
# }); # next.iconv
];
# buildInputs = orig.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"
# ];
});
# file-roller = super.file-roller.override { # file-roller = super.file-roller.override {
# # fixes "src/meson.build:106:0: ERROR: Program 'glib-compile-resources' not found or not executable" # # fixes "src/meson.build:106:0: ERROR: Program 'glib-compile-resources' not found or not executable"
# inherit (emulated) stdenv; # inherit (emulated) stdenv;