From f14ff86ec92260ffa3225622a8b813b99eac3ae4 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 28 Feb 2018 09:42:13 -0600 Subject: [PATCH] bintools-wrapper: fix breakage on aarch64, where "isArm" is false Unintentionally changed in #35247 --- pkgs/build-support/bintools-wrapper/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix index 98b40114c69..8e94ccfa49b 100644 --- a/pkgs/build-support/bintools-wrapper/default.nix +++ b/pkgs/build-support/bintools-wrapper/default.nix @@ -171,7 +171,7 @@ stdenv.mkDerivation { else if targetPlatform.isWindows then "pe" else "elf" + toString targetPlatform.parsed.cpu.bits; endianPrefix = if targetPlatform.isBigEndian then "big" else "little"; - sep = optionalString (targetPlatform.isx86 || targetPlatform.isArm) "-"; + sep = optionalString (!targetPlatform.isMips) "-"; arch = /**/ if targetPlatform.isAarch64 then endianPrefix + "aarch64" else if targetPlatform.isArm then endianPrefix + "arm"