From 2c593e8e760c8d210ae135a4a7ee4bf6d227f6ba Mon Sep 17 00:00:00 2001 From: adisbladis Date: Wed, 24 Feb 2021 23:21:05 +0100 Subject: buildGoPackage: Respect passing CGO_ENABLED explicitly This used to work but was broken by 6a27d63a882d1daecd1dce9e61135ccea3b0696e. --- pkgs/development/go-packages/generic/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/go-packages/generic/default.nix b/pkgs/development/go-packages/generic/default.nix index 0a1b3a9a294..8a093a03d1c 100644 --- a/pkgs/development/go-packages/generic/default.nix +++ b/pkgs/development/go-packages/generic/default.nix @@ -35,6 +35,8 @@ # IE: programs coupled with the compiler , allowGoReference ? false +, CGO_ENABLED ? go.CGO_ENABLED + , meta ? {}, ... } @ args: @@ -75,11 +77,13 @@ let ++ (lib.optional (!dontRenameImports) govers) ++ nativeBuildInputs; buildInputs = buildInputs; - inherit (go) GOOS GOARCH GO386 CGO_ENABLED; + inherit (go) GOOS GOARCH GO386; GOHOSTARCH = go.GOHOSTARCH or null; GOHOSTOS = go.GOHOSTOS or null; + inherit CGO_ENABLED; + GO111MODULE = "off"; GOFLAGS = lib.optionals (!allowGoReference) [ "-trimpath" ]; -- cgit 1.4.1