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

overlays/cross: push calls,geary patches upstream

Browse Source
This commit is contained in:
Colin
2024-12-19 21:49:16 +00:00
parent 9047d72fe7
commit 70734e154b
2 changed files with 29 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
overlays/cross.nix
View File

@@ -178,15 +178,16 @@ in with final; {
# }; # };
# 2024/12/19: upstreaming is unblocked # 2024/12/19: upstreaming is unblocked
# out for PR: <https://github.com/NixOS/nixpkgs/pull/366638>
# fixes: "Exec format error: './calls-scan'" # fixes: "Exec format error: './calls-scan'"
calls = prev.calls.overrideAttrs (upstream: { # calls = prev.calls.overrideAttrs (upstream: {
# TODO: try building with mesonEmulatorHook when i upstream this # # TODO: try building with mesonEmulatorHook when i upstream this
# nativeBuildInputs = upstream.nativeBuildInputs ++ lib.optionals (!prev.stdenv.buildPlatform.canExecute prev.stdenv.hostPlatform) [ # # nativeBuildInputs = upstream.nativeBuildInputs ++ lib.optionals (!prev.stdenv.buildPlatform.canExecute prev.stdenv.hostPlatform) [
# mesonEmulatorHook # # mesonEmulatorHook
# ]; # # ];
outputs = lib.remove "devdoc" upstream.outputs; # outputs = lib.remove "devdoc" upstream.outputs;
mesonFlags = lib.remove "-Dgtk_doc=true" upstream.mesonFlags; # mesonFlags = lib.remove "-Dgtk_doc=true" upstream.mesonFlags;
}); # });
# 2024/11/19: upstreaming is unblocked # 2024/11/19: upstreaming is unblocked
delfin = (prev.delfin.override { delfin = (prev.delfin.override {
@@ -323,13 +324,14 @@ in with final; {
# }); # });
# 2024/12/19: upstreaming is unblocked # 2024/12/19: upstreaming is unblocked
geary = prev.geary.overrideAttrs (upstream: { # out for PR: <https://github.com/NixOS/nixpkgs/pull/366636>
buildInputs = upstream.buildInputs ++ [ # geary = prev.geary.overrideAttrs (upstream: {
# glib # buildInputs = upstream.buildInputs ++ [
appstream-glib # # glib
libxml2 # appstream-glib
]; # libxml2
}); # ];
# });
# 2024/12/18: upstreaming is unblocked # 2024/12/18: upstreaming is unblocked
glycin-loaders = (prev.glycin-loaders.override { glycin-loaders = (prev.glycin-loaders.override {

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

@@ -46,6 +46,18 @@ in
hash = "sha256-Dur6EFuc3uqMuJyXBKKIaj2Y0jA227y8U6lK06cQ718="; hash = "sha256-Dur6EFuc3uqMuJyXBKKIaj2Y0jA227y8U6lK06cQ718=";
}) })
(fetchpatch' {
name = "geary: fix cross compilation";
prUrl = "https://github.com/NixOS/nixpkgs/pull/366636";
hash = "sha256-lOGkarUaWBFl3wL3S0mtS6tvVaSFC7noRwboOLYlhkA=";
})
(fetchpatch' {
name = "calls: fix cross compilation";
prUrl = "https://github.com/NixOS/nixpkgs/pull/366638";
hash = "sha256-/DkyiGGTfi9Zr96L8QjAHXOjrOMH3Gc3KlT/5GbHvlU=";
})
(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";