summary refs log tree commit diff
path: root/pkgs/development/go-packages
diff options
context:
space:
mode:
authorDing Xiang Fei <dingxiangfei2009@gmail.com>2019-06-21 15:33:37 +0800
committerDing Xiang Fei <dingxiangfei2009@gmail.com>2019-06-25 14:42:12 +0800
commit6a27d63a882d1daecd1dce9e61135ccea3b0696e (patch)
treedcf9d5f1d6309fc1ef325462f34140fccef6339d /pkgs/development/go-packages
parente3afc85cbaf57637f829712f338aa12eff2f253a (diff)
downloadnixpkgs-6a27d63a882d1daecd1dce9e61135ccea3b0696e.tar
nixpkgs-6a27d63a882d1daecd1dce9e61135ccea3b0696e.tar.gz
nixpkgs-6a27d63a882d1daecd1dce9e61135ccea3b0696e.tar.bz2
nixpkgs-6a27d63a882d1daecd1dce9e61135ccea3b0696e.tar.lz
nixpkgs-6a27d63a882d1daecd1dce9e61135ccea3b0696e.tar.xz
nixpkgs-6a27d63a882d1daecd1dce9e61135ccea3b0696e.tar.zst
nixpkgs-6a27d63a882d1daecd1dce9e61135ccea3b0696e.zip
buildGoPackage: enable cross compilation
Diffstat (limited to 'pkgs/development/go-packages')
-rw-r--r--pkgs/development/go-packages/generic/default.nix9
1 files changed, 7 insertions, 2 deletions
diff --git a/pkgs/development/go-packages/generic/default.nix b/pkgs/development/go-packages/generic/default.nix
index 8e016fadfac..b3386aaf24b 100644
--- a/pkgs/development/go-packages/generic/default.nix
+++ b/pkgs/development/go-packages/generic/default.nix
@@ -72,14 +72,19 @@ let
 
   goPath = if goDeps != null then importGodeps { depsFile = goDeps; } ++ extraSrcs
                              else extraSrcs;
-  package = go.stdenv.mkDerivation (
+  package = stdenv.mkDerivation (
     (builtins.removeAttrs args [ "goPackageAliases" "disabled" "extraSrcs"]) // {
 
     nativeBuildInputs = [ removeReferencesTo go ]
       ++ (lib.optional (!dontRenameImports) govers) ++ nativeBuildInputs;
     buildInputs = buildInputs;
 
-    inherit (go) GOOS GOARCH;
+    inherit (go) GOOS GOARCH GO386 CGO_ENABLED;
+
+    GOHOSTARCH = go.GOHOSTARCH or null;
+    GOHOSTOS = go.GOHOSTOS or null;
+
+    GOARM = toString (stdenv.lib.intersectLists [(stdenv.hostPlatform.parsed.cpu.version or "")] ["5" "6" "7"]);
 
     configurePhase = args.configurePhase or ''
       runHook preConfigure