movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-14 06:00:33 +03:00
Code Activity

pulseaudio: Resolve conflicting asound.conf of pulseaudio and alsa

Browse source 
Fixes issue #25790.
This commit is contained in:
Balletie 2017-07-01 00:01:58 +02:00
parent d4f45ae393
commit 44fadbb9bd
No known key found for this signature in database
GPG key ID: A728847A61ACE466
2 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
nixos/modules/config/pulseaudio.nix
View file

@ -6,6 +6,7 @@ with lib;
let let
cfg = config.hardware.pulseaudio; cfg = config.hardware.pulseaudio;
alsaCfg = config.sound;
systemWide = cfg.enable && cfg.systemWide; systemWide = cfg.enable && cfg.systemWide;
nonSystemWide = cfg.enable && !cfg.systemWide; nonSystemWide = cfg.enable && !cfg.systemWide;
@ -76,6 +77,7 @@ let
ctl.!default { ctl.!default {
type pulse type pulse
} }
${alsaCfg.extraConfig}
''); '');
in { in {

4
nixos/modules/services/audio/alsa.nix
View file

@ -7,6 +7,8 @@ let
inherit (pkgs) alsaUtils; inherit (pkgs) alsaUtils;
pulseaudioEnabled = config.hardware.pulseaudio.enable;
in in
{ {
@ -80,7 +82,7 @@ in
environment.systemPackages = [ alsaUtils ]; environment.systemPackages = [ alsaUtils ];
environment.etc = mkIf (config.sound.extraConfig != "") environment.etc = mkIf (!pulseaudioEnabled && config.sound.extraConfig != "")
[ [
{ source = pkgs.writeText "asound.conf" config.sound.extraConfig; { source = pkgs.writeText "asound.conf" config.sound.extraConfig;
target = "asound.conf"; target = "asound.conf";