From 42955023b2aa6d0ebfef5dbff0c9bc474e343a08 Mon Sep 17 00:00:00 2001 From: Gilberto Bertin Date: Mon, 11 May 2026 12:34:22 +0200 Subject: [PATCH] rust.lib: restore required trailing \ Commit c4f5dfad0dfd was intended as a stylistic cleanup, but the trailing \ it removed from pkgs/build-support/rust/lib/default.nix was not stylistic: it is a shell line continuation that joins the cross-only env var block to the cargo command added by consumers. Without it, `CC_*`, `CXX_*`, and `CARGO_TARGET_*_LINKER` are silently not passed to cargo when rustTargetPlatform != rustHostPlatform. This in turn can break cross compilation of Rust packages. Fix it by adding back the trailing \ Fixes: #497857 Signed-off-by: Gilberto Bertin --- pkgs/build-support/rust/lib/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/rust/lib/default.nix b/pkgs/build-support/rust/lib/default.nix index 7198fa961a91..e492d03e3026 100644 --- a/pkgs/build-support/rust/lib/default.nix +++ b/pkgs/build-support/rust/lib/default.nix @@ -77,7 +77,7 @@ + lib.optionalString (rustTargetPlatform != rustHostPlatform) '' "CC_${stdenv.targetPlatform.rust.cargoEnvVarTarget}=${ccForTarget}" \ "CXX_${stdenv.targetPlatform.rust.cargoEnvVarTarget}=${cxxForTarget}" \ - "CARGO_TARGET_${stdenv.targetPlatform.rust.cargoEnvVarTarget}_LINKER=${ccForTarget}" + "CARGO_TARGET_${stdenv.targetPlatform.rust.cargoEnvVarTarget}_LINKER=${ccForTarget}" \ ''; }; }