movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-12 04:35:41 +03:00
Code Issues Projects Releases Packages 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
commit 4fbe10f581
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
pkgs/build-support/bintools-wrapper/default.nix
View file

@ -492,7 +492,7 @@ stdenvNoCC.mkDerivation {
darwinMinVersionVariable 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`. # Wrapped compilers should do something useful even when no SDK is provided at `DEVELOPER_DIR`.
fallback_sdk = apple-sdk.__spliced.buildTarget or apple-sdk; fallback_sdk = apple-sdk.__spliced.buildTarget or apple-sdk;
}; };

2
pkgs/build-support/cc-wrapper/default.nix
View file

@ -889,7 +889,7 @@ stdenvNoCC.mkDerivation {
# These will become empty strings when not targeting Darwin. # These will become empty strings when not targeting Darwin.
inherit (targetPlatform) darwinMinVersion darwinMinVersionVariable; 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`. # Wrapped compilers should do something useful even when no SDK is provided at `DEVELOPER_DIR`.
fallback_sdk = apple-sdk.__spliced.buildTarget or apple-sdk; fallback_sdk = apple-sdk.__spliced.buildTarget or apple-sdk;
}; };