From 44fadbb9bd3e8e49f7d966a8519f5e049aa71fb5 Mon Sep 17 00:00:00 2001 From: Balletie Date: Sat, 1 Jul 2017 00:01:58 +0200 Subject: pulseaudio: Resolve conflicting asound.conf of pulseaudio and alsa Fixes issue #25790. --- nixos/modules/services/audio/alsa.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'nixos/modules/services') diff --git a/nixos/modules/services/audio/alsa.nix b/nixos/modules/services/audio/alsa.nix index 53786dbc6270..acf48d3c3d03 100644 --- a/nixos/modules/services/audio/alsa.nix +++ b/nixos/modules/services/audio/alsa.nix @@ -7,6 +7,8 @@ let inherit (pkgs) alsaUtils; + pulseaudioEnabled = config.hardware.pulseaudio.enable; + in { @@ -80,7 +82,7 @@ in environment.systemPackages = [ alsaUtils ]; - environment.etc = mkIf (config.sound.extraConfig != "") + environment.etc = mkIf (!pulseaudioEnabled && config.sound.extraConfig != "") [ { source = pkgs.writeText "asound.conf" config.sound.extraConfig; target = "asound.conf"; -- cgit 1.4.1