From 887edae254823a8428a7119c8f052aac9313836a Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Wed, 19 Apr 2023 18:34:47 +0000 Subject: [PATCH] tests.makeBinaryWrapper: avoid same-triple cross We shouldn't try compiling to aarch64-unknown-linux-gnu from aarch64-unknown-linux-gnu, because that tends to confuse things and is not representative of actual cross compilation usage. --- pkgs/test/make-binary-wrapper/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/test/make-binary-wrapper/default.nix b/pkgs/test/make-binary-wrapper/default.nix index afc2b41ff5a7..4c6fffd100a7 100644 --- a/pkgs/test/make-binary-wrapper/default.nix +++ b/pkgs/test/make-binary-wrapper/default.nix @@ -52,7 +52,7 @@ let "prefix" "suffix" ] makeGoldenTest // lib.optionalAttrs (! stdenv.isDarwin) { - cross = pkgsCross.aarch64-multiplatform.callPackage ./cross.nix { }; + cross = pkgsCross.${if stdenv.buildPlatform.isAarch64 then "gnu64" else "aarch64-multiplatform"}.callPackage ./cross.nix { }; }; in