Skip to content

librist: fix build for musl#355235

Merged
Atemu merged 1 commit intoNixOS:stagingfrom
alyssais:librist-musl
Nov 12, 2024
Merged

librist: fix build for musl#355235
Atemu merged 1 commit intoNixOS:stagingfrom
alyssais:librist-musl

Conversation

@alyssais
Copy link
Member

I'll submit this upstream, but I have to wait for my account for the VideoLAN GitLab to be approved, and I don't know how long that will take. We have until the start of the next cycle, though, because it's too late to get this into staging-next.

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.11 Release Notes (or backporting 23.11 and 24.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@alyssais alyssais requested a review from Atemu November 11, 2024 17:00
@alyssais alyssais mentioned this pull request Nov 11, 2024
14 tasks
@alyssais alyssais added the 6.topic: musl Running or building packages with musl libc label Nov 11, 2024
@Atemu
Copy link
Member

Atemu commented Nov 12, 2024

Could you add that bit of info to a code comment above the patch?

@ofborg build pkgsMusl.librist

Copy link
Member

@Atemu Atemu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The patch itself is simple enough

@ofborg ofborg bot requested review from SebTM and raphaelr November 12, 2024 05:45
@ofborg ofborg bot added 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. labels Nov 12, 2024
@wegank wegank added the 12.approvals: 1 This PR was reviewed and approved by one person. label Nov 12, 2024
@github-actions github-actions bot removed the 6.topic: musl Running or building packages with musl libc label Nov 12, 2024
@alyssais
Copy link
Member Author

My account got approved, so I've added a link to the upstream MR.

@Atemu
Copy link
Member

Atemu commented Nov 12, 2024

@ofborg build pkgsMusl.librist

@Atemu Atemu merged commit c987152 into NixOS:staging Nov 12, 2024
@github-actions
Copy link
Contributor

Backport failed for staging-24.11: couldn't find remote ref staging-24.11.
Please ensure that this Github repo has a branch named staging-24.11.

@github-actions
Copy link
Contributor

Successfully created backport PR for staging-24.11:

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. 12.approvals: 1 This PR was reviewed and approved by one person.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants