pkgsMusl.ostree: fix build#306727
Merged
SuperSandro2000 merged 1 commit intoNixOS:masterfrom Apr 25, 2024
Merged
Conversation
Nixpkgs currently uses musl 1.2.3, which does not provide a statx(2) wrapper, which ostree now depends upon. Work on upgrading musl is ongoing, but for now, to keep ostree building, let's follow upstream's recommendation and revert the statx changes. Once the musl upgrade is complete, this change can be reverted. I've applied the patches conditionally, only for musl, to avoid impacting functionality for other platforms. Fixes: 1a56b35 ("ostree: version bump and removing old patches")
Mindavi
approved these changes
Apr 25, 2024
Contributor
Mindavi
left a comment
Mindavi
left a comment
There was a problem hiding this comment.
Great that they made it so easily revertable. Sounds good to me to do this revert since upstream indeed recommends it and AFAICT it's not supposed to be a (significant) change in behaviour. But it's also kind of flying over my head, so...
13 tasks
ofborg
bot
added
10.rebuild-darwin: 0
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
3 participants
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.
Description of changes
Nixpkgs currently uses musl 1.2.3, which does not provide a statx(2) wrapper, which ostree now depends upon. Work on upgrading musl is ongoing, but for now, to keep ostree building, let's follow upstream's recommendation and revert the statx changes. Once the musl upgrade is complete, this change can be reverted.
I've applied the patches conditionally, only for musl, to avoid impacting functionality for other platforms.
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.