Skip to content

alsa-ucm-conf: apply patch to fix SplitPCM: Device argument may not b…#272991

Merged
1 commit merged intoNixOS:stagingfrom
Sporesirius:alsa-ucm-conf-splitpcm-device-argument-fix
Jan 23, 2024
Merged

alsa-ucm-conf: apply patch to fix SplitPCM: Device argument may not b…#272991
1 commit merged intoNixOS:stagingfrom
Sporesirius:alsa-ucm-conf-splitpcm-device-argument-fix

Conversation

@Sporesirius
Copy link
Contributor

@Sporesirius Sporesirius commented Dec 8, 2023

Description of changes

This patch fixes some audio devices working with alsa-ucm-conf that use SplitPCM.
Upstream fix: alsa-project/alsa-ucm-conf@b68aa52

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.05 Release Notes (or backporting 23.05 and 23.11 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.

@NixOSInfra NixOSInfra added the 12.first-time contribution This PR is the author's first one; please be gentle! label Dec 8, 2023
@ofborg ofborg bot requested a review from roastiek December 9, 2023 01:35
@ofborg ofborg bot added 10.rebuild-darwin: 101-500 This PR causes between 101 and 500 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. labels Dec 9, 2023
@Sporesirius
Copy link
Contributor Author

Hey @IogaMaster I watched your video about NixOS and I would like to take you up on your offer of a PR review.

Copy link
Contributor

@IogaMaster IogaMaster left a comment

Choose a reason for hiding this comment

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

Looks great! Thanks for watching my video!

@delroth delroth added the 12.approvals: 1 This PR was reviewed and approved by one person. label Dec 16, 2023
@oddlama
Copy link
Member

oddlama commented Dec 17, 2023

LGTM
I've encountered the same problem on one of my devices, and applying this patch fixes it.

@delroth delroth 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 Dec 17, 2023
@Sporesirius
Copy link
Contributor Author

Can this be merged, or is there a problem?

@ghost
Copy link

ghost commented Dec 19, 2023

Needed to fix issue GoXLR-on-Linux/goxlr-utility/issues/138

Copy link
Contributor

@roastiek roastiek left a comment

Choose a reason for hiding this comment

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

Looks ok.

@delroth delroth removed the 12.approvals: 2 This PR was reviewed and approved by two persons. label Dec 19, 2023
@delroth delroth added the 12.approvals: 2 This PR was reviewed and approved by two persons. label Dec 19, 2023
@ofborg ofborg bot requested a review from roastiek December 19, 2023 14:14
@delroth delroth added 12.approvals: 3+ This PR was reviewed and approved by three or more persons. and removed 12.approvals: 2 This PR was reviewed and approved by two persons. labels Dec 20, 2023
@errnoh
Copy link
Contributor

errnoh commented Dec 20, 2023

Any plans to backport this to 23.11 once it's merged? This issue causes some audio interfaces that were working in 23.05 to not work properly in 23.11.

@Sporesirius
Copy link
Contributor Author

@errnoh I would love that. AFAIK from the CONTRIBUTING.md only a nixpkgs maintainer can backport. But what I'm wondering is why the "approved by: package-maintainer" label is not set, since I thought @roastiek was the maintainer of alsa-ucm-conf?
I think we have to wait for a nixpkgs committer anyway.

@Sporesirius
Copy link
Contributor Author

Hi @SuperSandro2000, can you please review this PR.

@oddlama
Copy link
Member

oddlama commented Dec 21, 2023

This PR will cause a whole lot of rebuilds because it's a dependency of alsa-lib, so maybe this should target staging and not master.

@Sporesirius Sporesirius marked this pull request as draft December 21, 2023 19:58
@Sporesirius Sporesirius force-pushed the alsa-ucm-conf-splitpcm-device-argument-fix branch from f571db7 to 7a485e1 Compare December 21, 2023 20:05
@Sporesirius Sporesirius changed the base branch from master to staging December 21, 2023 20:06
@Sporesirius Sporesirius marked this pull request as ready for review December 22, 2023 14:49
@delroth delroth removed the 12.approvals: 3+ This PR was reviewed and approved by three or more persons. label Dec 22, 2023
@SuperSandro2000
Copy link
Member

This should really be one comment otherwise LGTM

@delroth delroth 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. labels Dec 23, 2023
@Sporesirius Sporesirius force-pushed the alsa-ucm-conf-splitpcm-device-argument-fix branch from 955cc99 to 92605d2 Compare December 23, 2023 14:13
@Sporesirius
Copy link
Contributor Author

@SuperSandro2000 I squashed the commits. Hope it's good now.

@delroth delroth removed the 12.approvals: 3+ This PR was reviewed and approved by three or more persons. label Dec 23, 2023
@delroth delroth added the 12.approvals: 3+ This PR was reviewed and approved by three or more persons. label Dec 23, 2023
@arh78750
Copy link

please forgive my nix noob question. This fixes and issue I currently have with my goxlr. I was able to get this patch and apply it to the nixpkgs in my nix config but because so much depends on alsa it tried to rebuild like half the packages on my system from source. Is there any way for me to somehow apply to patch to the package but let all the other things on the system build with the old version? https://github.com/arh78750/nixosconfig/blob/d3d6f1ad90dfe5d626f9309a927cb93534af7a80/flake.nix#L19 here is where I'm applying the patch.

@oddlama
Copy link
Member

oddlama commented Dec 25, 2023

@arh78750 Since this is a very simple one-byte patch of a configuration file, I personally just manually edited the file of the broken package in the nix-store by temporarily mounting it rw. In practice you should never ever do that, but in this specific case it's an acceptable workaround because it doesn't affect dependent packages and would otherwise cause too many rebuilds. Just be prepared to redo it when you update your system.

@roastiek
Copy link
Contributor

roastiek commented Jan 2, 2024

You only need update settings of pipewire or pulseaudio service. Other applications don't read ucm configs directly.

You can change theirs package option with recompiled original againts patches alsa/alsa-ucm-conf.

Or setup ALSA_CONFIG_UCM2 env variable in those services to the new patched config. I think that it worked at leats with pulseaudio two years ago.

@Sporesirius
Copy link
Contributor Author

Does anyone know why "ofborg-eval" and "ofborg-eval-lib-tests" failed? I just squashed the two commits for @SuperSandro2000

@SuperSandro2000
Copy link
Member

Seems unrelated to me. Probably something else was broken on staging.

@ofborg build alsa-ucm-conf
@ofborg eval

@Sporesirius
Copy link
Contributor Author

@ofborg build alsa-ucm-conf
@ofborg eval

@Sporesirius
Copy link
Contributor Author

Hey @roastiek, can you review, pls.
Is there anything that needs to be taken care of or can it be merged?

Copy link

@ghost ghost left a comment

Choose a reason for hiding this comment

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

@ghost ghost merged commit f7e667c into NixOS:staging Jan 23, 2024
@Sporesirius
Copy link
Contributor Author

@a-n-n-a-l-e-e thanks for the merge. Is it possible to backport this to 23.11?

@github-actions
Copy link
Contributor

This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

10.rebuild-darwin: 101-500 This PR causes between 101 and 500 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. 12.first-time contribution This PR is the author's first one; please be gentle!

Projects

None yet

Development

Successfully merging this pull request may close these issues.

9 participants