diff options
| author | Balletie <skip_meesie@hotmail.com> | 2017-07-01 00:01:58 +0200 |
|---|---|---|
| committer | Balletie <skip_meesie@hotmail.com> | 2017-07-01 00:06:34 +0200 |
| commit | 44fadbb9bd3e8e49f7d966a8519f5e049aa71fb5 (patch) | |
| tree | 1ee6984578834fedfa1ab5c27cf87fe73f241d3e /nixos/modules/services/audio/alsa.nix | |
| parent | d4f45ae39398ed813b97b9c696185ae9c2afff02 (diff) | |
| download | nixlib-44fadbb9bd3e8e49f7d966a8519f5e049aa71fb5.tar nixlib-44fadbb9bd3e8e49f7d966a8519f5e049aa71fb5.tar.gz nixlib-44fadbb9bd3e8e49f7d966a8519f5e049aa71fb5.tar.bz2 nixlib-44fadbb9bd3e8e49f7d966a8519f5e049aa71fb5.tar.lz nixlib-44fadbb9bd3e8e49f7d966a8519f5e049aa71fb5.tar.xz nixlib-44fadbb9bd3e8e49f7d966a8519f5e049aa71fb5.tar.zst nixlib-44fadbb9bd3e8e49f7d966a8519f5e049aa71fb5.zip | |
pulseaudio: Resolve conflicting asound.conf of pulseaudio and alsa
Fixes issue #25790.
Diffstat (limited to 'nixos/modules/services/audio/alsa.nix')
| -rw-r--r-- | nixos/modules/services/audio/alsa.nix | 4 |
1 files changed, 3 insertions, 1 deletions
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"; |