diff options
author | Maximilian Bosch <maximilian@mbosch.me> | 2019-12-30 12:32:16 +0100 |
---|---|---|
committer | Maximilian Bosch <maximilian@mbosch.me> | 2019-12-30 12:42:28 +0100 |
commit | 7acacddfa5339da9296ecd0ff806e904ad074e06 (patch) | |
tree | 51560973f090189b5d53ee610b5b0ea47e200721 /pkgs/top-level | |
parent | 0852b7d5bb4191f46c966eb7c12a9ebf0b1f3015 (diff) |
go*: fix aarch64 build
Some tests don't work well with gcc9 atm, those tests use CC from `buildPackages.stdenv.cc` which had to be modified for Aarch64 as well.
Diffstat (limited to 'pkgs/top-level')
-rw-r--r-- | pkgs/top-level/all-packages.nix | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7513834a25b5a..879c6562707f5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8225,15 +8225,19 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; - go_1_12 = callPackage ../development/compilers/go/1.12.nix { + go_1_12 = callPackage ../development/compilers/go/1.12.nix ({ inherit (darwin.apple_sdk.frameworks) Security Foundation; - stdenv = if stdenv.isAarch64 then gcc8Stdenv else stdenv; - }; + } // lib.optionalAttrs stdenv.isAarch64 { + stdenv = gcc8Stdenv; + buildPackages = buildPackages // { stdenv = gcc8Stdenv; }; + }); - go_1_13 = callPackage ../development/compilers/go/1.13.nix { + go_1_13 = callPackage ../development/compilers/go/1.13.nix ({ inherit (darwin.apple_sdk.frameworks) Security Foundation; - stdenv = if stdenv.isAarch64 then gcc8Stdenv else stdenv; - }; + } // lib.optionalAttrs stdenv.isAarch64 { + stdenv = gcc8Stdenv; + buildPackages = buildPackages // { stdenv = gcc8Stdenv; }; + }); go = go_1_13; |