From 862ac2b728e51aef65180866e79f3c0def31968e Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Mon, 9 Feb 2026 22:27:37 +0100
Subject: [PATCH] xdp-tools: move env variable(s) into env for structuredAttrs

---
 pkgs/by-name/xd/xdp-tools/package.nix | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/xd/xdp-tools/package.nix b/pkgs/by-name/xd/xdp-tools/package.nix
index 3607ae911ad9..a81e22426e2e 100644
--- a/pkgs/by-name/xd/xdp-tools/package.nix
+++ b/pkgs/by-name/xd/xdp-tools/package.nix
@@ -53,15 +53,21 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   hardeningDisable = [ "zerocallusedregs" ];
-  # When building BPF, the default CC wrapper is interfering a bit too much.
-  BPF_CFLAGS = "-fno-stack-protector -Wno-error=unused-command-line-argument";
-  # When cross compiling, configure prefers the unwrapped clang unless told otherwise.
-  CLANG = lib.getExe buildPackages.llvmPackages.clang;
 
-  PRODUCTION = 1;
-  DYNAMIC_LIBXDP = 1;
-  FORCE_SYSTEM_LIBBPF = 1;
-  FORCE_EMACS = 1;
+  env = {
+    # When building BPF, the default CC wrapper is interfering a bit too much.
+    BPF_CFLAGS = toString [
+      "-fno-stack-protector"
+      "-Wno-error=unused-command-line-argument"
+    ];
+    # When cross compiling, configure prefers the unwrapped clang unless told otherwise.
+    CLANG = lib.getExe buildPackages.llvmPackages.clang;
+
+    PRODUCTION = 1;
+    DYNAMIC_LIBXDP = 1;
+    FORCE_SYSTEM_LIBBPF = 1;
+    FORCE_EMACS = 1;
+  };
 
   makeFlags = [
     "PREFIX=$(out)"