From b407a8797d6a3f5b4db61dfa34d235efd0d1f40b Mon Sep 17 00:00:00 2001 From: Angel J <78835633+iamanaws@users.noreply.github.com> Date: Mon, 4 May 2026 20:22:38 -0700 Subject: [PATCH] cargo-wizard: fix aarch64-linux test expectation --- pkgs/by-name/ca/cargo-wizard/package.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/by-name/ca/cargo-wizard/package.nix b/pkgs/by-name/ca/cargo-wizard/package.nix index e0c1a2d17d26..dc6edca96c61 100644 --- a/pkgs/by-name/ca/cargo-wizard/package.nix +++ b/pkgs/by-name/ca/cargo-wizard/package.nix @@ -18,6 +18,14 @@ rustPlatform.buildRustPackage (finalAttrs: { cargoHash = "sha256-vRakgwZRyYkk3xFfZzl197tgRmx+/g2b8eaDunwrCzM="; + # cargo-wizard still suggests lld for aarch64-linux on Rust 1.90+, so the + # nightly integration test must expect both rustflags there. + postPatch = '' + substituteInPlace tests/integration/dialog.rs \ + --replace-fail 'if rustversion::cfg!(before(1.90.0)) {' \ + 'if rustversion::cfg!(before(1.90.0)) || cfg!(all(target_os = "linux", target_arch = "aarch64")) {' + ''; + preCheck = '' export PATH=$PATH:$PWD/target/${stdenv.hostPlatform.rust.rustcTarget}/$cargoBuildType '';