libpsl: fix Darwin cross-compilation #347007
Merged
Conversation
This file contains 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
52 tasks
ofborg
bot
added
6.topic: cross-compilation
emilazy
reviewed
Oct 8, 2024
| ] ++ lib.optional (!stdenv.hostPlatform.isStatic) python3; | ||
| ] ++ lib.optional ( | ||
| !stdenv.hostPlatform.isStatic | ||
| || (!stdenv.hostPlatform.isDarwin || stdenv.buildPlatform == stdenv.hostPlatform) |
There was a problem hiding this comment.
This should be &&, right? Otherwise static non‐Darwin starts including Python 3.
It might be nice to set broken on Darwin cross Python and base this on python3.meta.broken instead, since I think the other conditional here is because static Python also broke recently…
reckenrode
force-pushed
the
push-kxspnlrursow
branch
3 times, most recently
from
cd35593 to
1550fc9
Compare
ofborg
bot
added
10.rebuild-linux: 0
Don’t include Python in libpsl’s build inputs when cross compiling to Darwin. Python does not support cross-compilation to Darwin, which prevents cross-compiling anything that depends on libpsl (such as curl).
reckenrode
force-pushed
the
push-kxspnlrursow
branch
from
1550fc9 to
ebd2404
Compare
emilazy
approved these changes
Oct 11, 2024
14 tasks
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.
Don’t include Python in libpsl’s build inputs when cross compiling to Darwin. Python does not support cross-compilation to Darwin (see python/cpython#90905), which prevents cross-compiling anything that depends on libpsl (such as curl).
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.