treewide: CGO_ENABLED -> env.CGO_ENABLED

Signed-off-by: Paul Meyer <[email protected]>
edgelesssys · Jan 20, 2025 · 5105256 · 5105256
1 parent cdce06c
commit 5105256
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 8 deletions.
diff --git a/packages/by-name/cloud-api-adaptor/package.nix b/packages/by-name/cloud-api-adaptor/package.nix
@@ -70,7 +70,7 @@ buildGoModule rec {
     "cmd/process-user-data"
   ];
 
-  CGO_ENABLED = if withLibvirt then 1 else 0;
+  env.CGO_ENABLED = if withLibvirt then 1 else 0;
 
   tags = builtinCloudProviders;
 

diff --git a/packages/by-name/contrast/package.nix b/packages/by-name/contrast/package.nix
@@ -203,7 +203,8 @@ buildGoModule rec {
     install -D ${kata.genpolicy.settings-dev}/genpolicy-settings.json cli/genpolicy/assets/genpolicy-settings-kata.json
   '';
 
-  CGO_ENABLED = 0;
+  env.CGO_ENABLED = 0;
+
   ldflags = [
     "-s"
     "-X github.com/edgelesssys/contrast/internal/constants.Version=v${version}"

diff --git a/packages/by-name/microsoft/kata-runtime/package.nix b/packages/by-name/microsoft/kata-runtime/package.nix
@@ -44,7 +44,7 @@ buildGoModule rec {
     git
   ];
 
-  CGO_ENABLED = 0;
+  env.CGO_ENABLED = 0;
   ldflags = [ "-s" ];
 
   checkFlags =

diff --git a/packages/by-name/nydus-pull/package.nix b/packages/by-name/nydus-pull/package.nix
@@ -14,7 +14,8 @@ buildGoModule rec {
 
   subPackages = [ "." ];
 
-  CGO_ENABLED = 0;
+  env.CGO_ENABLED = 0;
+
   ldflags = [
     "-s"
     "-X main.version=v${version}"

diff --git a/packages/by-name/nydus-snapshotter/package.nix b/packages/by-name/nydus-snapshotter/package.nix
@@ -33,7 +33,7 @@ buildGoModule rec {
     "cmd/nydus-overlayfs"
   ];
 
-  CGO_ENABLED = "0";
+  env.CGO_ENABLED = "0";
 
   ldflags = [
     "-s"

diff --git a/packages/by-name/service-mesh/package.nix b/packages/by-name/service-mesh/package.nix
@@ -28,10 +28,10 @@ buildGoModule rec {
 
   subPackages = [ "." ];
 
-  CGO_ENABLED = 0;
+  env.CGO_ENABLED = 0;
+
   ldflags = [
     "-s"
-    "-w"
     "-X main.version=v${version}"
   ];
 

diff --git a/packages/by-name/tdx-measure/package.nix b/packages/by-name/tdx-measure/package.nix
@@ -16,7 +16,8 @@ buildGoModule rec {
 
   subPackages = [ "." ];
 
-  CGO_ENABLED = 0;
+  env.CGO_ENABLED = 0;
+
   ldflags = [
     "-s"
     "-X main.version=v${version}"