summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYongun Seong <nevivurn@nevi.dev>2024-04-06 02:29:45 +0900
committerYongun Seong <nevivurn@nevi.dev>2024-04-14 14:27:44 +0900
commit3e28bdc6786cb4192f2a04248cf65c49bc43bcd0 (patch)
treede9b1f6e9d3d9ae3257fb7fcbac6f88ef503b9eb
parent51af9f69ac6c3ee6f1950d6f4abcc922aa46b2f2 (diff)
buildGoModule: inherit env from main package to goModule derivation
-rw-r--r--doc/languages-frameworks/go.section.md1
-rw-r--r--pkgs/applications/misc/pop/default.nix2
-rw-r--r--pkgs/applications/networking/cluster/talosctl/default.nix2
-rw-r--r--pkgs/build-support/go/module.nix1
-rw-r--r--pkgs/by-name/mc/mcap-cli/package.nix2
-rw-r--r--pkgs/development/tools/opcr-policy/default.nix2
-rw-r--r--pkgs/tools/networking/oneshot/default.nix2
7 files changed, 7 insertions, 5 deletions
diff --git a/doc/languages-frameworks/go.section.md b/doc/languages-frameworks/go.section.md
index 6db0e73505d2..2f4cb0326a8a 100644
--- a/doc/languages-frameworks/go.section.md
+++ b/doc/languages-frameworks/go.section.md
@@ -142,6 +142,7 @@ Many attributes [controlling the build phase](#variables-controlling-the-build-p
- [`patchFlags`](#var-stdenv-patchFlags)
- [`postPatch`](#var-stdenv-postPatch)
- [`preBuild`](#var-stdenv-preBuild)
+- `env`: useful for passing down variables such as `GOWORK`.
To control test execution of the build derivation, the following attributes are of interest:
diff --git a/pkgs/applications/misc/pop/default.nix b/pkgs/applications/misc/pop/default.nix
index 3fbf063e7315..f20ab86c85c9 100644
--- a/pkgs/applications/misc/pop/default.nix
+++ b/pkgs/applications/misc/pop/default.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
vendorHash = "sha256-8YcJXvR0cdL9PlP74Qh6uN2XZoN16sz/yeeZlBsk5N8=";
- GOWORK = "off";
+ env.GOWORK = "off";
nativeBuildInputs = [
installShellFiles
diff --git a/pkgs/applications/networking/cluster/talosctl/default.nix b/pkgs/applications/networking/cluster/talosctl/default.nix
index afc3b7bdf5aa..3651d4652fc7 100644
--- a/pkgs/applications/networking/cluster/talosctl/default.nix
+++ b/pkgs/applications/networking/cluster/talosctl/default.nix
@@ -15,7 +15,7 @@ buildGoModule rec {
ldflags = [ "-s" "-w" ];
- GOWORK = "off";
+ env.GOWORK = "off";
subPackages = [ "cmd/talosctl" ];
diff --git a/pkgs/build-support/go/module.nix b/pkgs/build-support/go/module.nix
index ab8491da34cd..6f568c0eb4f9 100644
--- a/pkgs/build-support/go/module.nix
+++ b/pkgs/build-support/go/module.nix
@@ -84,6 +84,7 @@ let
preBuild = args.preBuild or "";
postBuild = args.modPostBuild or "";
sourceRoot = args.sourceRoot or "";
+ env = args.env or { };
impureEnvVars = lib.fetchers.proxyImpureEnvVars ++ [
"GIT_PROXY_COMMAND"
diff --git a/pkgs/by-name/mc/mcap-cli/package.nix b/pkgs/by-name/mc/mcap-cli/package.nix
index 81853d252efa..80ddcd574b02 100644
--- a/pkgs/by-name/mc/mcap-cli/package.nix
+++ b/pkgs/by-name/mc/mcap-cli/package.nix
@@ -20,7 +20,7 @@ buildGoModule {
modRoot = "go/cli/mcap";
- GOWORK="off";
+ env.GOWORK="off";
# copy the local versions of the workspace modules
postConfigure = ''
diff --git a/pkgs/development/tools/opcr-policy/default.nix b/pkgs/development/tools/opcr-policy/default.nix
index e1900a1f84f3..e8d4e9a599ab 100644
--- a/pkgs/development/tools/opcr-policy/default.nix
+++ b/pkgs/development/tools/opcr-policy/default.nix
@@ -19,7 +19,7 @@ buildGoModule rec {
subPackages = [ "cmd/policy" ];
# disable go workspaces
- GOWORK = "off";
+ env.GOWORK = "off";
doCheck = false;
diff --git a/pkgs/tools/networking/oneshot/default.nix b/pkgs/tools/networking/oneshot/default.nix
index 3ecca675e18c..fe3948041d1a 100644
--- a/pkgs/tools/networking/oneshot/default.nix
+++ b/pkgs/tools/networking/oneshot/default.nix
@@ -15,7 +15,7 @@ buildGoModule rec {
subPackages = [ "cmd" ];
- GOWORK = "off";
+ env.GOWORK = "off";
modRoot = "v2";