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

overlays/cross: update upstreaming status

Browse Source
This commit is contained in:
Colin
2025-04-04 16:44:37 +00:00
parent ccf2d5baa1
commit 29002c62fb
1 changed files with 11 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
overlays/cross.nix
View File

@@ -465,7 +465,7 @@ in with final; {
# callPackage = self.newScope { inherit (self) qtCompatVersion qtModule srcs; inherit stdenv; }; # callPackage = self.newScope { inherit (self) qtCompatVersion qtModule srcs; inherit stdenv; };
# }); # });
# 2024/11/19: upstreaming blocked on glycin-loaders # 2025/04/04: upstreaming blocked on glycin-loaders
loupe = prev.loupe.override { loupe = prev.loupe.override {
cargo = crossCargo; cargo = crossCargo;
}; };
@@ -508,10 +508,10 @@ in with final; {
# fixes: "ar: command not found" # fixes: "ar: command not found"
# `ar` is provided by bintools # `ar` is provided by bintools
# 2025/01/13: upstreaming is unblocked by deps; but turns out to not be this simple # 2025/04/04: upstreaming is unblocked by deps; but turns out to not be this simple
# ncftp = addNativeInputs [ bintools ] prev.ncftp; # ncftp = addNativeInputs [ bintools ] prev.ncftp;
# 2024/11/19: upstreaming is unblocked # 2025/04/04: upstreaming is unblocked
newsflash = (prev.newsflash.override { newsflash = (prev.newsflash.override {
blueprint-compiler = wrapBlueprint [ blueprint-compiler = wrapBlueprint [
buildPackages.clapper buildPackages.clapper
@@ -658,7 +658,7 @@ in with final; {
]; ];
}); });
# 2025/01/25: upstreaming is unblocked # 2025/04/04: upstreaming is unblocked
papers = prev.papers.override { papers = prev.papers.override {
cargo = crossCargo; cargo = crossCargo;
}; };
@@ -689,7 +689,7 @@ in with final; {
# ]; # ];
# } prev.phosh-mobile-settings; # } prev.phosh-mobile-settings;
# 2025/01/13: upstreaming is unblocked # 2025/04/04: upstreaming is unblocked
pwvucontrol = prev.pwvucontrol.override { pwvucontrol = prev.pwvucontrol.override {
cargo = crossCargo; cargo = crossCargo;
}; };
@@ -794,24 +794,13 @@ in with final; {
xcb-imdkit = null; xcb-imdkit = null;
}; };
# 2024/05/31: upstreaming is unblocked; requires some changes, as configure tries to invoke our `python` # 2025/04/04: upstreaming is blocked on glycin-loaders
# implemented (broken) on servo cross-staging-2023-07-30 branch
# rpm = prev.rpm.overrideAttrs (upstream: {
# # fixes "python too old". might also be specifiable as a configure flag?
# env = upstream.env // lib.optionalAttrs (upstream.version == "4.18.1") {
# # 4.19.0 upgrade should fix cross compilation.
# # see: <https://github.com/NixOS/nixpkgs/pull/260558>
# PYTHON = python3.interpreter;
# };
# });
# 2025/01/13: upstreaming is blocked on glycin-loaders
snapshot = prev.snapshot.override { snapshot = prev.snapshot.override {
# fixes "error: linker `cc` not found" # fixes "error: linker `cc` not found"
cargo = crossCargo; cargo = crossCargo;
}; };
# 2025/01/13: upstreaming is unblocked # 2025/04/04: upstreaming is unblocked
spot = prev.spot.override { spot = prev.spot.override {
blueprint-compiler = wrapBlueprint [ blueprint-compiler = wrapBlueprint [
buildPackages.gdk-pixbuf buildPackages.gdk-pixbuf
@@ -825,7 +814,7 @@ in with final; {
cargo = crossCargo; cargo = crossCargo;
}; };
# 2025/01/13: upstreaming is unblocked # 2025/04/04: upstreaming is unblocked
# squeekboard = prev.squeekboard.overrideAttrs (upstream: { # squeekboard = prev.squeekboard.overrideAttrs (upstream: {
# # fixes: "meson.build:1:0: ERROR: 'rust' compiler binary not defined in cross or native file" # # fixes: "meson.build:1:0: ERROR: 'rust' compiler binary not defined in cross or native file"
# # new error: "meson.build:1:0: ERROR: Rust compiler rustc --target aarch64-unknown-linux-gnu -C linker=aarch64-unknown-linux-gnu-gcc can not compile programs." # # new error: "meson.build:1:0: ERROR: Rust compiler rustc --target aarch64-unknown-linux-gnu -C linker=aarch64-unknown-linux-gnu-gcc can not compile programs."
@@ -893,7 +882,7 @@ in with final; {
# fixes: "ar: command not found" # fixes: "ar: command not found"
# `ar` is provided by bintools # `ar` is provided by bintools
# 2024/05/31: upstreaming is blocked on gnustep-base cross compilation # 2025/04/04: upstreaming is blocked on gnustep-base cross compilation
# unar = addNativeInputs [ bintools ] prev.unar; # unar = addNativeInputs [ bintools ] prev.unar;
# unixODBCDrivers = prev.unixODBCDrivers // { # unixODBCDrivers = prev.unixODBCDrivers // {
@@ -956,10 +945,10 @@ in with final; {
# upstream.postBuild; # upstream.postBuild;
# }); # });
# 2024/11/19: upstreaming is blocked on unar (gnustep), unless i also make that optional # 2025/04/04: upstreaming is blocked on unar (gnustep), unless i also make that optional
xarchiver = mvToNativeInputs [ libxslt ] prev.xarchiver; xarchiver = mvToNativeInputs [ libxslt ] prev.xarchiver;
# 2025/03/15: upstreaming (to staging) is unblocked, but proper fix is more involved: # 2025/04/04: upstreaming is unblocked, but proper fix is more involved:
# can't disable the `installedTests` output by reading `finalAttrs.doCheck` because infinite recursion; # can't disable the `installedTests` output by reading `finalAttrs.doCheck` because infinite recursion;
# working fix is either to fix test building (not running) to work under cross, or give the package an ugly # working fix is either to fix test building (not running) to work under cross, or give the package an ugly
# `installCheck` call arg & gate things there. # `installCheck` call arg & gate things there.