Skip to content

[Backport release-25.05] Don't trigger the evaluation of apple-sdk in Linux stdenv - #409630

Merged
Aleksanaa merged 1 commit into
release-25.05from
backport-409574-to-release-25.05
May 22, 2025
Merged

Aleksanaa merged 1 commit into
release-25.05from
backport-409574-to-release-25.05

Conversation

@nixpkgs-ci

@nixpkgs-ci nixpkgs-ci Bot commented May 22, 2025

Copy link
Copy Markdown
Contributor

Bot-based backport to release-25.05, triggered by a label in #409574.

  • Before merging, ensure that this backport is acceptable for the release.
    • Even as a non-committer, if you find that it is not acceptable, leave a comment.

During the Apple SDK revamp of #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

(cherry picked from commit 5953ae5)
@github-actions github-actions Bot added the 4.workflow: backport This targets a stable branch label May 22, 2025
@nix-owners
nix-owners Bot requested a review from Ericson2314 May 22, 2025 03:34
@github-actions github-actions Bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. labels May 22, 2025
@Aleksanaa
Aleksanaa merged commit 7060e0d into release-25.05 May 22, 2025
@bjornfor
bjornfor deleted the backport-409574-to-release-25.05 branch May 24, 2025 06:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

4.workflow: backport This targets a stable branch 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants