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

cross: evolution-data-server: ship the compile fix partially upstream

Browse Source
This commit is contained in:
Colin
2024-12-19 10:08:29 +00:00
parent 6a60077e44
commit 18903a68bb
2 changed files with 39 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
overlays/cross.nix
View File

@@ -240,37 +240,37 @@ in with final; {
}; };
# 2024/12/18: upstreaming is unblocked # 2024/12/18: upstreaming is unblocked
evolution-data-server = prev.evolution-data-server.overrideAttrs (upstream: { # evolution-data-server = prev.evolution-data-server.overrideAttrs (upstream: {
cmakeFlags = upstream.cmakeFlags ++ [ # cmakeFlags = upstream.cmakeFlags ++ [
"-DCMAKE_CROSSCOMPILING_EMULATOR=${stdenv.hostPlatform.emulator buildPackages}" # "-DCMAKE_CROSSCOMPILING_EMULATOR=${stdenv.hostPlatform.emulator buildPackages}"
"-DENABLE_TESTS=no" # "-DENABLE_TESTS=no"
"-DGETTEXT_MSGFMT_EXECUTABLE=${lib.getBin buildPackages.gettext}/bin/msgfmt" # "-DGETTEXT_MSGFMT_EXECUTABLE=${lib.getBin buildPackages.gettext}/bin/msgfmt"
"-DGETTEXT_MSGMERGE_EXECUTABLE=${lib.getBin buildPackages.gettext}/bin/msgmerge" # "-DGETTEXT_MSGMERGE_EXECUTABLE=${lib.getBin buildPackages.gettext}/bin/msgmerge"
"-DGETTEXT_XGETTEXT_EXECUTABLE=${lib.getBin buildPackages.gettext}/bin/xgettext" # "-DGETTEXT_XGETTEXT_EXECUTABLE=${lib.getBin buildPackages.gettext}/bin/xgettext"
"-DGLIB_COMPILE_RESOURCES=${lib.getDev buildPackages.glib}/bin/glib-compile-resources" # "-DGLIB_COMPILE_RESOURCES=${lib.getDev buildPackages.glib}/bin/glib-compile-resources"
"-DGLIB_COMPILE_SCHEMAS=${lib.getDev buildPackages.glib}/bin/glib-compile-schemas" # "-DGLIB_COMPILE_SCHEMAS=${lib.getDev buildPackages.glib}/bin/glib-compile-schemas"
];
postPatch = (upstream.postPatch or "") + ''
substituteInPlace src/addressbook/libebook-contacts/CMakeLists.txt --replace-fail \
'COMMAND ''${CMAKE_CURRENT_BINARY_DIR}/gen-western-table' \
'COMMAND ${stdenv.hostPlatform.emulator buildPackages} ''${CMAKE_CURRENT_BINARY_DIR}/gen-western-table'
substituteInPlace src/camel/CMakeLists.txt --replace-fail \
'COMMAND ''${CMAKE_CURRENT_BINARY_DIR}/camel-gen-tables' \
'COMMAND ${stdenv.hostPlatform.emulator buildPackages} ''${CMAKE_CURRENT_BINARY_DIR}/camel-gen-tables'
'';
# 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 ++ [
# perl # fixes "The 'perl' not found, not installing csv2vcard"
# # glib
# # libiconv
# # iconv
# ]; # ];
# buildInputs = upstream.buildInputs ++ [ # postPatch = (upstream.postPatch or "") + ''
# pcre2 # fixes: "Package 'libpcre2-8', required by 'glib-2.0', not found" # substituteInPlace src/addressbook/libebook-contacts/CMakeLists.txt --replace-fail \
# mount # fails to fix: "Package 'mount', required by 'gio-2.0', not found" # 'COMMAND ''${CMAKE_CURRENT_BINARY_DIR}/gen-western-table' \
# ]; # 'COMMAND ${stdenv.hostPlatform.emulator buildPackages} ''${CMAKE_CURRENT_BINARY_DIR}/gen-western-table'
}); # substituteInPlace src/camel/CMakeLists.txt --replace-fail \
# 'COMMAND ''${CMAKE_CURRENT_BINARY_DIR}/camel-gen-tables' \
# 'COMMAND ${stdenv.hostPlatform.emulator buildPackages} ''${CMAKE_CURRENT_BINARY_DIR}/camel-gen-tables'
# '';
# # 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 ++ [
# # perl # fixes "The 'perl' not found, not installing csv2vcard"
# # # glib
# # # libiconv
# # # iconv
# # ];
# # buildInputs = upstream.buildInputs ++ [
# # pcre2 # fixes: "Package 'libpcre2-8', required by 'glib-2.0', not found"
# # mount # fails to fix: "Package 'mount', required by 'gio-2.0', not found"
# # ];
# });
# 2024/08/12: upstreaming is blocked on poppler-glib (via nautilus) # 2024/08/12: upstreaming is blocked on poppler-glib (via nautilus)
# 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"

8
pkgs/by-name/nixpkgs-bootstrap/patches.nix
View File

@@ -46,6 +46,14 @@ in
hash = "sha256-Dur6EFuc3uqMuJyXBKKIaj2Y0jA227y8U6lK06cQ718="; hash = "sha256-Dur6EFuc3uqMuJyXBKKIaj2Y0jA227y8U6lK06cQ718=";
}) })
(fetchpatch' {
name = "evolution-data-server: enable cross compilation";
prUrl = "https://github.com/NixOS/nixpkgs/pull/366487";
saneCommit = "51feeeaf41472737623c8832338d7d658ac41a0b";
# hash = "sha256-0H2o7qItY2lfoVH81+P3Y8q1kkrSEKrH6kcRz8Ph760=";
hash = "sha256-DFeJdBqlx3wQ/AqlbWMDbyEZm3hclXgvH3a0Shyw4YA=";
})
(fetchpatch' { (fetchpatch' {
name = "nixos/bonsaid: init"; name = "nixos/bonsaid: init";
prUrl = "https://github.com/NixOS/nixpkgs/pull/347818"; prUrl = "https://github.com/NixOS/nixpkgs/pull/347818";