From 44de917dcf8ffed9e69b4d5d4549fb7efdb2777a Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Thu, 19 Feb 2026 19:44:36 +0100 Subject: [PATCH 1/4] pdnsd: move CPPFLAGS into env for structuredAttrs --- pkgs/by-name/pd/pdnsd/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/pd/pdnsd/package.nix b/pkgs/by-name/pd/pdnsd/package.nix index 34d4c93f8272..ab2f7690280d 100644 --- a/pkgs/by-name/pd/pdnsd/package.nix +++ b/pkgs/by-name/pd/pdnsd/package.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: { configureFlags = [ "--enable-ipv6" ]; # fix ipv6 on darwin - CPPFLAGS = "-D__APPLE_USE_RFC_3542"; + env.CPPFLAGS = "-D__APPLE_USE_RFC_3542"; meta = { description = "Permanent DNS caching"; From f1b8abec85ab0c91b9433e360163ec04db93a103 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Thu, 19 Feb 2026 19:44:37 +0100 Subject: [PATCH 2/4] pgadmin4: move CPPFLAGS into env for structuredAttrs --- pkgs/by-name/pg/pgadmin4/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/pg/pgadmin4/package.nix b/pkgs/by-name/pg/pgadmin4/package.nix index 91b26eb89a3e..21ce2e8285fe 100644 --- a/pkgs/by-name/pg/pgadmin4/package.nix +++ b/pkgs/by-name/pg/pgadmin4/package.nix @@ -58,7 +58,7 @@ pythonPackages.buildPythonApplication rec { }; # from Dockerfile - CPPFLAGS = "-DPNG_ARM_NEON_OPT=0"; + env.CPPFLAGS = "-DPNG_ARM_NEON_OPT=0"; format = "setuptools"; From b143dd9c69a07675501b9eb6e7f20c6e09502f9c Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Thu, 19 Feb 2026 19:44:37 +0100 Subject: [PATCH 3/4] rkdeveloptool: move CPPFLAGS into env for structuredAttrs --- pkgs/by-name/rk/rkdeveloptool/package.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/rk/rkdeveloptool/package.nix b/pkgs/by-name/rk/rkdeveloptool/package.nix index 2439b6136eb3..1799adfc7b29 100644 --- a/pkgs/by-name/rk/rkdeveloptool/package.nix +++ b/pkgs/by-name/rk/rkdeveloptool/package.nix @@ -26,9 +26,10 @@ stdenv.mkDerivation { buildInputs = [ libusb1 ]; # main.cpp:1568:36: error: '%s' directive output may be truncated writing up to 557 bytes into a region of size 5 - CPPFLAGS = + env.CPPFLAGS = toString ( lib.optionals stdenv.cc.isGNU [ "-Wno-error=format-truncation" ] - ++ lib.optionals stdenv.isDarwin [ "-Wno-error=vla-cxx-extension" ]; + ++ lib.optionals stdenv.isDarwin [ "-Wno-error=vla-cxx-extension" ] + ); meta = { homepage = "https://github.com/rockchip-linux/rkdeveloptool"; From d4af80cb4be478086b3b78cc1288d4e85b66353a Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Thu, 19 Feb 2026 19:44:37 +0100 Subject: [PATCH 4/4] sooperlooper: move CPPFLAGS into env for structuredAttrs --- pkgs/by-name/so/sooperlooper/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/so/sooperlooper/package.nix b/pkgs/by-name/so/sooperlooper/package.nix index c849da803959..0644d475067a 100644 --- a/pkgs/by-name/so/sooperlooper/package.nix +++ b/pkgs/by-name/so/sooperlooper/package.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: { ]; # see https://bugs.gentoo.org/925275 - CPPFLAGS = "-fpermissive"; + env.CPPFLAGS = "-fpermissive"; enableParallelBuilding = true;