buildGo{Module,Package}: set GOTOOLCHAIN to local

prevent go from downloading another toolchain

zowoq 86cd7e09 41ccfa32

+4 -2
+3 -2
pkgs/build-support/go/module.nix
··· 53 args = removeAttrs args' [ "overrideModAttrs" "vendorSha256" "vendorHash" ]; 54 55 GO111MODULE = "on"; 56 57 goModules = if (vendorHash == null) then "" else 58 (stdenv.mkDerivation { ··· 62 63 inherit (args) src; 64 inherit (go) GOOS GOARCH; 65 - inherit GO111MODULE; 66 67 # The following inheritence behavior is not trivial to expect, and some may 68 # argue it's not ideal. Changing it may break vendor hashes in Nixpkgs and ··· 151 inherit (go) GOOS GOARCH; 152 153 GOFLAGS = lib.optionals (!proxyVendor) [ "-mod=vendor" ] ++ lib.optionals (!allowGoReference) [ "-trimpath" ]; 154 - inherit CGO_ENABLED enableParallelBuilding GO111MODULE; 155 156 configurePhase = args.configurePhase or ('' 157 runHook preConfigure
··· 53 args = removeAttrs args' [ "overrideModAttrs" "vendorSha256" "vendorHash" ]; 54 55 GO111MODULE = "on"; 56 + GOTOOLCHAIN = "local"; 57 58 goModules = if (vendorHash == null) then "" else 59 (stdenv.mkDerivation { ··· 63 64 inherit (args) src; 65 inherit (go) GOOS GOARCH; 66 + inherit GO111MODULE GOTOOLCHAIN; 67 68 # The following inheritence behavior is not trivial to expect, and some may 69 # argue it's not ideal. Changing it may break vendor hashes in Nixpkgs and ··· 152 inherit (go) GOOS GOARCH; 153 154 GOFLAGS = lib.optionals (!proxyVendor) [ "-mod=vendor" ] ++ lib.optionals (!allowGoReference) [ "-trimpath" ]; 155 + inherit CGO_ENABLED enableParallelBuilding GO111MODULE GOTOOLCHAIN; 156 157 configurePhase = args.configurePhase or ('' 158 runHook preConfigure
+1
pkgs/build-support/go/package.nix
··· 86 inherit CGO_ENABLED enableParallelBuilding; 87 88 GO111MODULE = "off"; 89 GOFLAGS = lib.optionals (!allowGoReference) [ "-trimpath" ]; 90 91 GOARM = toString (lib.intersectLists [(stdenv.hostPlatform.parsed.cpu.version or "")] ["5" "6" "7"]);
··· 86 inherit CGO_ENABLED enableParallelBuilding; 87 88 GO111MODULE = "off"; 89 + GOTOOLCHAIN = "local"; 90 GOFLAGS = lib.optionals (!allowGoReference) [ "-trimpath" ]; 91 92 GOARM = toString (lib.intersectLists [(stdenv.hostPlatform.parsed.cpu.version or "")] ["5" "6" "7"]);