gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't trigger the evaluation of apple-sdk in Linux stdenv (#409574)

Browse Source
This commit is contained in:
Randy Eckenrode
2025-05-21 23:31:40 -04:00
committed by GitHub
parent efa98030f3 5953ae56d8
commit 4fbe10f581
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/build-support/bintools-wrapper/default.nix
+1 -1
View File
@@ -492,7 +492,7 @@ stdenvNoCC.mkDerivation {
darwinMinVersionVariable
;
}
// lib.optionalAttrs (apple-sdk != null && stdenvNoCC.targetPlatform.isDarwin) {
// lib.optionalAttrs (stdenvNoCC.targetPlatform.isDarwin && apple-sdk != null) {
# Wrapped compilers should do something useful even when no SDK is provided at `DEVELOPER_DIR`.
fallback_sdk = apple-sdk.__spliced.buildTarget or apple-sdk;
};
pkgs/build-support/cc-wrapper/default.nix
+1 -1
View File
@@ -889,7 +889,7 @@ stdenvNoCC.mkDerivation {
# These will become empty strings when not targeting Darwin.
inherit (targetPlatform) darwinMinVersion darwinMinVersionVariable;
}
// lib.optionalAttrs (apple-sdk != null && stdenvNoCC.targetPlatform.isDarwin) {
// lib.optionalAttrs (stdenvNoCC.targetPlatform.isDarwin && apple-sdk != null) {
# Wrapped compilers should do something useful even when no SDK is provided at `DEVELOPER_DIR`.
fallback_sdk = apple-sdk.__spliced.buildTarget or apple-sdk;
};