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

cross: upstream patches for nautilus, gnome-settings-daemon

Browse Source
This commit is contained in:
Colin
2025-01-14 08:30:13 +00:00
parent 3bd57f7370
commit 65633eea57
2 changed files with 34 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
overlays/cross.nix
View File

@@ -339,20 +339,21 @@ in with final; {
# fixes: "gdbus-codegen not found or executable"
# gnome-session = mvToNativeInputs [ glib ] super.gnome-session;
# 2025/01/13: upstreaming is unblocked
gnome-settings-daemon = prev.gnome-settings-daemon.overrideAttrs (orig: {
# 2024/12/18: upstreaming is blocked on poppler-glib (should be fixed in staging?)
# gsd is required by xdg-desktop-portal-gtk
# pkg-config solves: "plugins/power/meson.build:22:0: ERROR: Dependency lookup for glib-2.0 with method 'pkgconfig' failed: Pkg-config binary for machine build machine not found."
# stdenv.cc fixes: "plugins/power/meson.build:60:0: ERROR: No build machine compiler for 'plugins/power/gsd-power-enums-update.c'"
# but then it fails with a link-time error.
# depsBuildBuild = orig.depsBuildBuild or [] ++ [ glib pkg-config buildPackages.stdenv.cc ];
# hack to just not build the power plugin (panel?), to avoid cross compilation errors
postPatch = orig.postPatch + ''
substituteInPlace plugins/meson.build \
--replace-fail "disabled_plugins = []" "disabled_plugins = ['power']"
'';
});
# 2025/01/13: upstreaming is unblocked, out for review:
# - <https://github.com/NixOS/nixpkgs/pull/373666>
# gnome-settings-daemon = prev.gnome-settings-daemon.overrideAttrs (orig: {
# # 2024/12/18: upstreaming is blocked on poppler-glib (should be fixed in staging?)
# # gsd is required by xdg-desktop-portal-gtk
# # pkg-config solves: "plugins/power/meson.build:22:0: ERROR: Dependency lookup for glib-2.0 with method 'pkgconfig' failed: Pkg-config binary for machine build machine not found."
# # stdenv.cc fixes: "plugins/power/meson.build:60:0: ERROR: No build machine compiler for 'plugins/power/gsd-power-enums-update.c'"
# # but then it fails with a link-time error.
# # depsBuildBuild = orig.depsBuildBuild or [] ++ [ glib pkg-config buildPackages.stdenv.cc ];
# # hack to just not build the power plugin (panel?), to avoid cross compilation errors
# postPatch = orig.postPatch + ''
# substituteInPlace plugins/meson.build \
# --replace-fail "disabled_plugins = []" "disabled_plugins = ['power']"
# '';
# });
# 2025/01/13: upstreaming is blocked on gnome-settings-daemon, mutter, evolution-data-server
# gnome-shell = super.gnome-shell.overrideAttrs (orig: {
@@ -508,12 +509,13 @@ in with final; {
# postInstall = lib.replaceStrings [ "${glib.dev}" ] [ "${buildPackages.glib.dev}" ] orig.postInstall;
# });
# 2025/01/13: upstreaming is unblocked
nautilus = prev.nautilus.overrideAttrs (upstream: {
mesonFlags = upstream.mesonFlags ++ [
"-Dtests=none" # v.s. `headless` for native compilation
];
});
# 2025/01/13: upstreaming is unblocked, out for review:
# <https://github.com/NixOS/nixpkgs/pull/373662>
# nautilus = prev.nautilus.overrideAttrs (upstream: {
# mesonFlags = upstream.mesonFlags ++ [
# "-Dtests=none" # v.s. `headless` for native compilation
# ];
# });
# fixes: "ar: command not found"
# `ar` is provided by bintools

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

@@ -61,6 +61,18 @@ in
# hash = "sha256-jW66W1V3upZMfbjuoruY3OGNJfEewx7DW/Z4vAhMEXw=";
# })
(fetchpatch' {
name = "nautilus: fix cross compilation";
prUrl = "https://github.com/NixOS/nixpkgs/pull/373662";
hash = "sha256-/51SnUExwsqSSwgR3dxUozDAMf5wHoMIT7+NDpIdYNI=";
})
(fetchpatch' {
name = "gnome-settings-daemon: fix cross compilation";
prUrl = "https://github.com/NixOS/nixpkgs/pull/373666";
hash = "sha256-Mdyw34MhFiscGUYYcPhOoQBrXDzAvPiWp3/OuB7kB30=";
})
(fetchpatch' {
# patch should be safe to remove; keeping it here to track the upstreaming status
name = "nixos/gitea: don't configure the database if `createDatabase == false`";