Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

pulseaudio: Resolve conflicting asound.conf of pulseaudio and alsa #27000

Merged
merged 1 commit into from Jul 17, 2017

Conversation

Balletie
Copy link
Contributor

@Balletie Balletie commented Jun 30, 2017

Motivation for this change

It wasn't possible to configure asound.conf when pulseaudio was enabled as well.
Now sound.extraConfig is added at the end of asound.conf if pulseaudio is enabled. The original expression for creating asound.conf in the alsa module is only created if pulseaudio is disabled.

Fixes issue #25790.

Things done
  • Tested using sandboxing
    (nix.useSandbox on NixOS,
    or option build-use-sandbox in nix.conf
    on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • Linux
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

@mention-bot
Copy link

@Balletie, thanks for your PR! By analyzing the history of the files in this pull request, we identified @rickynils, @edolstra and @Profpatsch to be potential reviewers.

@bennofs
Copy link
Contributor

bennofs commented Jul 17, 2017

Looks good to me, thanks!

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

Successfully merging this pull request may close these issues.

None yet

5 participants