From ce3c5727ee5268e3aa0e574d2fbc2a579a358f01 Mon Sep 17 00:00:00 2001 From: Aliaksandr Date: Sun, 5 Apr 2026 02:51:35 +0300 Subject: [PATCH] bintools-wrapper: replace // optionalAttrs with nullable attr names Same pattern as cc-wrapper: inline mapAttrs+optionalString for Darwin env vars and replace optionalAttrs for fallback_sdk. --- pkgs/build-support/bintools-wrapper/default.nix | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix index b97eb905bd31..1a9ce996c0dd 100644 --- a/pkgs/build-support/bintools-wrapper/default.nix +++ b/pkgs/build-support/bintools-wrapper/default.nix @@ -468,19 +468,14 @@ stdenvNoCC.mkDerivation { libc_lib ; default_hardening_flags_str = toString defaultHardeningFlags; - } - // lib.mapAttrs (_: lib.optionalString targetPlatform.isDarwin) { # These will become empty strings when not targeting Darwin. - inherit (targetPlatform) - darwinPlatform - darwinSdkVersion - darwinMinVersion - darwinMinVersionVariable - ; - } - // lib.optionalAttrs (stdenvNoCC.targetPlatform.isDarwin && apple-sdk != null) { + darwinPlatform = lib.optionalString targetPlatform.isDarwin targetPlatform.darwinPlatform; + darwinSdkVersion = lib.optionalString targetPlatform.isDarwin targetPlatform.darwinSdkVersion; + darwinMinVersion = lib.optionalString targetPlatform.isDarwin targetPlatform.darwinMinVersion; + darwinMinVersionVariable = lib.optionalString targetPlatform.isDarwin targetPlatform.darwinMinVersionVariable; # Wrapped compilers should do something useful even when no SDK is provided at `DEVELOPER_DIR`. - fallback_sdk = apple-sdk.__spliced.buildTarget or apple-sdk; + ${if stdenvNoCC.targetPlatform.isDarwin && apple-sdk != null then "fallback_sdk" else null} = + apple-sdk.__spliced.buildTarget or apple-sdk; }; meta =