From c4bdbc9f1bbd3557a8afe4e8960df704707286b5 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Thu, 19 Feb 2026 19:41:03 +0100 Subject: [PATCH] findutils: move CFLAGS into env for structuredAttrs --- pkgs/tools/misc/findutils/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/misc/findutils/default.nix b/pkgs/tools/misc/findutils/default.nix index 569877e9c994..7738cbfa020f 100644 --- a/pkgs/tools/misc/findutils/default.nix +++ b/pkgs/tools/misc/findutils/default.nix @@ -57,11 +57,13 @@ stdenv.mkDerivation (finalAttrs: { "--localstatedir=/var/cache" ]; - CFLAGS = lib.optionals stdenv.hostPlatform.isDarwin [ - # TODO: Revisit upstream issue https://savannah.gnu.org/bugs/?59972 - # https://github.com/Homebrew/homebrew-core/pull/69761#issuecomment-770268478 - "-D__nonnull\\(params\\)=" - ]; + env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { + CFLAGS = toString [ + # TODO: Revisit upstream issue https://savannah.gnu.org/bugs/?59972 + # https://github.com/Homebrew/homebrew-core/pull/69761#issuecomment-770268478 + "-D__nonnull\\(params\\)=" + ]; + }; postInstall = '' moveToOutput bin/locate $locate