Repository navigation
Don't trigger the evaluation of apple-sdk in Linux stdenv - #409574
Merged
reckenrode merged 1 commit intoMay 22, 2025
Merged
Conversation
During the Apple SDK revamp of NixOS#346043, cc-wrapper and bintools-wrapper were modified to automatically add a fallback SDK if $DEVELOPER_DIR is not set [^1]. However, because of the order of the && operands, apple-sdk is always evaluated even when it's not needed. Flip the && operands so we only trigger the evaluation when targeting Darwin. [^1]: 51755b0
3 of 13 tasks
ethancedwards8
approved these changes
May 22, 2025
reckenrode
approved these changes
May 22, 2025
reckenrode
left a comment
Contributor
There was a problem hiding this comment.
LGTM. Let’s backport this to 24.12 and 25.05.
Contributor
|
Successfully created backport PR for |
1 task
Contributor
|
Successfully created backport PR for |
1 task
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
During the Apple SDK revamp of #346043,
cc-wrapperandbintools-wrapperwere modified to automatically add a fallback SDK if$DEVELOPER_DIRis not set. However, because of the order of the&&operands,apple-sdkis always evaluated even when it's not needed.Let's flip the
&&operands so we only trigger the evaluation when targeting Darwin. This should speed things up too.Example
Apply this simple patch:
And watch everything explode on Linux while it tries to call
fetchSDKwith the bootstrapfetchurl:Things done
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)Add a 👍 reaction to pull requests you find important.