diff --git a/overlays/cross.nix b/overlays/cross.nix index eb1d41d81..614b8430d 100644 --- a/overlays/cross.nix +++ b/overlays/cross.nix @@ -675,11 +675,11 @@ in with final; { # # ''; # }); - # 2025/08/26: upstreaming is unblocked, but not as simple as the glycin-loaders approach! - snapshot = prev.snapshot.override { - # fixes "error: linker `cc` not found" - cargo = crossCargo; - }; + # 2025/08/26: upstreaming is unblocked; implemented on desko `pr-snapshot-cross` branch + # snapshot = prev.snapshot.override { + # # fixes "error: linker `cc` not found" + # cargo = crossCargo; + # }; # 2025/08/26: upstreaming is unblocked; patched on desko branch `pr-spot-cross` # spot = prev.spot.override { diff --git a/pkgs/by-name/nixpkgs-bootstrap/master.nix b/pkgs/by-name/nixpkgs-bootstrap/master.nix index 274efd6f9..e4ab3398c 100644 --- a/pkgs/by-name/nixpkgs-bootstrap/master.nix +++ b/pkgs/by-name/nixpkgs-bootstrap/master.nix @@ -14,8 +14,8 @@ mkNixpkgs ? import ./mkNixpkgs.nix {}, }: mkNixpkgs { - rev = "f39808415aee96e539b4c06fb5df23a872c63702"; - sha256 = "sha256-XcMe9OxRtRN9pf6xHXYCl3vidRm9i98FGjYmdzVgtS0="; + rev = "2882c071a83fa909c4c3d171f65c71000e90f9fb"; + sha256 = "sha256-q5G/GIlkYheWnM667b/mm1sVWK9FpncwQU8vdMIcJE0="; version = "unstable-2025-08-27"; branch = "master"; } diff --git a/pkgs/by-name/nixpkgs-bootstrap/patches.nix b/pkgs/by-name/nixpkgs-bootstrap/patches.nix index 5e26a7084..4be3cbd33 100644 --- a/pkgs/by-name/nixpkgs-bootstrap/patches.nix +++ b/pkgs/by-name/nixpkgs-bootstrap/patches.nix @@ -62,6 +62,12 @@ in hash = "sha256-B7s2aNVony+G7FW2PaR7FVO7zzWa7SiLONWRGrsXA3A="; }) + (fetchpatch' { + name = "gmobile: set strictDeps, fix cross compilation"; + saneCommit = "223b327fcc0775212bcc30a0bfb57c90ce5e3251"; + hash = "sha256-ww6oAJF/AA6GhqJ1nS3QhHHcH7xiZUcNOKKvtE6NkGQ="; + }) + (fetchpatch' { # desko nixpkgs branch: `pr-papers-cross` name = "papers: fix cross compilation"; @@ -90,6 +96,13 @@ in hash = "sha256-ZDDRdGPpxER/i2trBDiovbIZc0Qe94iUp/XdWvIvG98="; }) + (fetchpatch' { + # desko nixpkgs branch: `pr-snapshot-cross` + name = "snapshot: fix cross compilation"; + saneCommit = "9bf01eef452d46c2990cdc872017f1015892ea7d"; + hash = "sha256-F6RwprsXOWjk/xNHtBqQWge5edLGJeQUrupKZ1MNphU="; + }) + # (fetchpatch' { # # opencv used by alpaca, newelle # name = "opencv: fix cross compliation by patching protobuf";