diff --git a/overlays/cross.nix b/overlays/cross.nix index f28887d41..eb1d41d81 100644 --- a/overlays/cross.nix +++ b/overlays/cross.nix @@ -675,16 +675,16 @@ in with final; { # # ''; # }); - # 2025/08/26: upstreaming is unblocked + # 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 - spot = prev.spot.override { - cargo = crossCargo; - }; + # 2025/08/26: upstreaming is unblocked; patched on desko branch `pr-spot-cross` + # spot = prev.spot.override { + # cargo = crossCargo; + # }; # 2025/07/27: upstreaming is unblocked # squeekboard = prev.squeekboard.overrideAttrs (upstream: { @@ -781,10 +781,10 @@ in with final; { # }); # }; - # 2025/08/26: upstreaming is unblocked - video-trimmer = prev.video-trimmer.override { - cargo = crossCargo; - }; + # 2025/08/26: upstreaming is unblocked; implemented on desko branch `pr-video-trimmer-cross` + # video-trimmer = prev.video-trimmer.override { + # cargo = crossCargo; + # }; # 2025/01/13: upstreaming is blocked on arrow-cpp, python-pyarrow, python-contourpy, python-matplotlib, python-h5py, python-pandas, google-cloud-cpp # visidata = prev.visidata.override { diff --git a/pkgs/by-name/nixpkgs-bootstrap/patches.nix b/pkgs/by-name/nixpkgs-bootstrap/patches.nix index 612281d33..8ca23700b 100644 --- a/pkgs/by-name/nixpkgs-bootstrap/patches.nix +++ b/pkgs/by-name/nixpkgs-bootstrap/patches.nix @@ -76,6 +76,20 @@ in hash = "sha256-Zj2U5y94oapHGZ/Ez/5pM5MY3wAwt5jj5hht9xDSHx0="; }) + (fetchpatch' { + # desko nixpkgs branch: `pr-spot-cross` + name = "spot: fix cross compilation"; + saneCommit = "09558b2d4b0e5fb74fc5c40b4c6cb0b7e72f7d00"; + hash = "sha256-vpTKdxY6ybXup9Xls662tQg1UikvLo4PTxU1A++Ynh4="; + }) + + (fetchpatch' { + # desko nixpkgs branch: `pr-video-trimmer-cross` + name = "video-trimmer: fix cross compilation"; + saneCommit = "6809ffd293ec65ef44deae7b6436afdcc4a36efb"; + hash = "sha256-ZDDRdGPpxER/i2trBDiovbIZc0Qe94iUp/XdWvIvG98="; + }) + (fetchpatch' { name = "coincurve: fix build"; # saneCommit = "cd118a2491e613f0d4dd8673a6ac17a0094dd987";