Skip to content

v4l-utils: fix build for musl#422973

Merged
alyssais merged 1 commit intoNixOS:stagingfrom
alyssais:v4l-utils-musl
Jul 7, 2025
Merged

v4l-utils: fix build for musl#422973
alyssais merged 1 commit intoNixOS:stagingfrom
alyssais:v4l-utils-musl

Conversation

@alyssais
Copy link
Member

@alyssais alyssais commented Jul 6, 2025

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/)
  • Nixpkgs 25.11 Release Notes (or backporting 25.05 Nixpkgs Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
  • NixOS 25.11 Release Notes (or backporting 25.05 NixOS Release notes)
    • (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, pkgs/README.md, maintainers/README.md and other contributing documentation in corresponding paths.

Add a 👍 reaction to pull requests you find important.

@alyssais alyssais requested review from K900 and flokli July 6, 2025 16:55
@ofborg ofborg bot added the 2.status: merge conflict This PR has merge conflicts with the target branch label Jul 6, 2025
@alyssais
Copy link
Member Author

alyssais commented Jul 6, 2025

(Note that on current staging a dependency fails to build, which I'm working on with upstream. I tested this on top of alyssais@9e25ab5.)

@ofborg ofborg bot removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Jul 6, 2025
Fixes: 9e25ab5 ("v4l-utils: 1.24.1 -> 1.30.1")
@nix-owners nix-owners bot requested a review from codyopel July 6, 2025 17:09
@nixpkgs-ci nixpkgs-ci bot added 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. labels Jul 6, 2025
Copy link
Member

@7c6f434c 7c6f434c left a comment

Choose a reason for hiding this comment

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

I have read the code and I have looked up the context and all this looks good!

@nixpkgs-ci nixpkgs-ci bot added the 12.approvals: 1 This PR was reviewed and approved by one person. label Jul 7, 2025
@nixpkgs-ci nixpkgs-ci bot added 12.approvals: 2 This PR was reviewed and approved by two persons. and removed 12.approvals: 1 This PR was reviewed and approved by one person. labels Jul 7, 2025
Copy link
Contributor

@Yarny0 Yarny0 left a comment

Choose a reason for hiding this comment

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

Sorry for breaking the musl build. muls is not really on my radar.

I tested this, after cherry-picking the commit onto https://github.com/NixOS/nixpkgs/tree/e13c3c3628760473f7cf72d87e13e7f3c5a6f7e9 :

  • pkgsMuls.v4l-utils builds fine.
  • dvbv5-zap (from that musl build) is able to tune and record a DVB-S2 channel with my DVB hardware.

While I can't test much more, this looks good and reasonable to me.

@nixpkgs-ci nixpkgs-ci bot added 12.approvals: 3+ This PR was reviewed and approved by three or more persons. 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in any of the changed packages. and removed 12.approvals: 2 This PR was reviewed and approved by two persons. labels Jul 7, 2025
@alyssais
Copy link
Member Author

alyssais commented Jul 7, 2025

No worries! Without CI I don't really expect people to notice. :)

@alyssais alyssais merged commit c03bcb2 into NixOS:staging Jul 7, 2025
30 of 33 checks passed
@alyssais alyssais deleted the v4l-utils-musl branch July 7, 2025 20:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 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: 3+ This PR was reviewed and approved by three or more persons. 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in any of the changed packages.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants