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

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

Browse Source 
Inline optionalAttrs for Go passthru attrs and fallback_sdk.
Replace mapAttrs+optionalString for Darwin env vars with direct
optionalString calls, eliminating intermediate attrset and // merge.
This commit is contained in:
Aliaksandr
2026-04-05 02:51:21 +03:00
parent a42becdd92
commit 77d67d4b76
1 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
pkgs/build-support/cc-wrapper/default.nix
View File

@@ -453,13 +453,12 @@ stdenvNoCC.mkDerivation {
inherit nixSupport;
inherit defaultHardeningFlags;
}
// optionalAttrs cc.langGo or false {
# So gccgo looks more like go for buildGoModule
inherit (targetPlatform.go) GOOS GOARCH GOARM;
CGO_ENABLED = 1;
${if cc.langGo or false then "GOOS" else null} = targetPlatform.go.GOOS;
${if cc.langGo or false then "GOARCH" else null} = targetPlatform.go.GOARCH;
${if cc.langGo or false then "GOARM" else null} = targetPlatform.go.GOARM;
${if cc.langGo or false then "CGO_ENABLED" else null} = 1;
};
dontBuild = true;
@@ -995,14 +994,12 @@ stdenvNoCC.mkDerivation {
inherit darwinPlatformForCC;
default_hardening_flags_str = toString defaultHardeningFlags;
inherit useMacroPrefixMap;
}
// lib.mapAttrs (_: lib.optionalString targetPlatform.isDarwin) {
# These will become empty strings when not targeting Darwin.
inherit (targetPlatform) darwinMinVersion darwinMinVersionVariable;
}
// lib.optionalAttrs (stdenvNoCC.targetPlatform.isDarwin && apple-sdk != null) {
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 =