From d75513badd0903e2d67258b0b511ef3e4e0219de Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Thu, 19 Feb 2026 18:52:41 +0100 Subject: [PATCH] netcap: move CGO_* env vars into env for structuredAttrs --- pkgs/by-name/ne/netcap/package.nix | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/ne/netcap/package.nix b/pkgs/by-name/ne/netcap/package.nix index f08dfe02bcfa..92768c3334e3 100644 --- a/pkgs/by-name/ne/netcap/package.nix +++ b/pkgs/by-name/ne/netcap/package.nix @@ -40,22 +40,27 @@ buildGoModule (finalAttrs: { ]; ldflags = [ - "-s -w" + "-s" + "-w" ]; tags = lib.optionals (!withDpi) [ "nodpi" ]; - CGO_LDFLAGS = lib.optionalString withDpi '' - -L${ndpi}/lib -lndpi - -L${libprotoident}/lib -lndpi - ''; + env = lib.optionalAttrs withDpi { + CGO_LDFLAGS = toString [ + "-L${ndpi}/lib" + "-lndpi" + "-L${libprotoident}/lib" + "-lndpi" + ]; - CGO_CFLAGS = lib.optionalString withDpi '' - -I${ndpi}/include - -I${libprotoident}/include - ''; + CGO_CFLAGS = toString [ + "-I${ndpi}/include" + "-I${libprotoident}/include" + ]; + }; postInstall = '' mv $out/bin/cmd $out/bin/net