public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #107553 from flokli/build-go-module-cross-cgo 

buildGoModule: fix cross-compilation with CGO_ENABLED=1
This commit is contained in:
Florian Klink 2020-12-26 23:45:08 +01:00 committed by GitHub
parent d26e8bdd9e 3c8981ee8b
commit 8b4cf23bdb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/go-modules/generic/default.nix
View File

@ -46,7 +46,7 @@ with builtins;
let let
args = removeAttrs args' [ "overrideModAttrs" "vendorSha256" "disabled" ]; args = removeAttrs args' [ "overrideModAttrs" "vendorSha256" "disabled" ];
go-modules = if vendorSha256 != null then go.stdenv.mkDerivation (let modArgs = { go-modules = if vendorSha256 != null then stdenv.mkDerivation (let modArgs = {
name = "${name}-go-modules"; name = "${name}-go-modules";
@ -119,7 +119,7 @@ let
} }
) // overrideModAttrs modArgs) else ""; ) // overrideModAttrs modArgs) else "";
package = go.stdenv.mkDerivation (args // { package = stdenv.mkDerivation (args // {
nativeBuildInputs = [ go ] ++ nativeBuildInputs; nativeBuildInputs = [ go ] ++ nativeBuildInputs;
inherit (go) GOOS GOARCH; inherit (go) GOOS GOARCH;