nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-06-05 21:03:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

bintools-wrapper: replace // optionalAttrs with nullable attr names

Browse Source 
Same pattern as cc-wrapper: inline mapAttrs+optionalString for Darwin
env vars and replace optionalAttrs for fallback_sdk.
This commit is contained in:
Aliaksandr
2026-04-05 02:51:35 +03:00
parent 77d67d4b76
commit ce3c5727ee
1 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
pkgs/build-support/bintools-wrapper/default.nix
View File

@@ -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 =