From e3892c9feb3ff2387262e862175701189b8a1429 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Mon, 3 Aug 2026 14:27:50 +0200 Subject: [PATCH 1/2] cc-wrapper: enable structuredAttrs --- pkgs/build-support/cc-wrapper/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index d926d85425a3..6644eaba3e75 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -1043,6 +1043,8 @@ stdenvNoCC.mkDerivation { apple-sdk.__spliced.buildTarget or apple-sdk; }; + __structuredAttrs = true; + meta = let cc_ = optionalAttrs (cc != null) cc; From df14ed8b022132f6fe867d19b9b00c7f5d1db0c8 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Wed, 26 Aug 2026 21:28:37 +0200 Subject: [PATCH 2/2] cc-wrapper: enable strictDeps and structuredAttrs for win-dll-hook.sh --- pkgs/build-support/cc-wrapper/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 6644eaba3e75..7ccf7b01888e 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -634,6 +634,8 @@ stdenvNoCC.mkDerivation { stdenvNoCC.mkDerivation { name = "win-dll-hook.sh"; dontUnpack = true; + strictDeps = true; + __structuredAttrs = true; installPhase = if targetPlatform.isCygwin then ''