From 17b6efaf3d27c369df5d6dd66370d5251102fa94 Mon Sep 17 00:00:00 2001 From: Sarah Brofeldt Date: Tue, 4 Sep 2018 11:24:03 +0200 Subject: [PATCH] go_1_11: Only allow one of GOARM=5, 6 or 7 --- pkgs/development/compilers/go/1.11.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/go/1.11.nix b/pkgs/development/compilers/go/1.11.nix index 55cc654b0aa..237f74e319f 100644 --- a/pkgs/development/compilers/go/1.11.nix +++ b/pkgs/development/compilers/go/1.11.nix @@ -139,7 +139,7 @@ stdenv.mkDerivation rec { else if stdenv.targetPlatform.isAarch32 then "arm" else if stdenv.targetPlatform.isAarch64 then "arm64" else throw "Unsupported system"; - GOARM = stdenv.targetPlatform.parsed.cpu.version or ""; + GOARM = toString (stdenv.lib.intersectLists [(stdenv.targetPlatform.parsed.cpu.version or "")] ["5" "6" "7"]); GO386 = 387; # from Arch: don't assume sse2 on i686 CGO_ENABLED = 1; GOROOT_BOOTSTRAP = "${goBootstrap}/share/go";