diff options
| author | Benno Fünfstück <benno.fuenfstueck@gmail.com> | 2017-07-17 08:20:38 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-17 08:20:38 +0200 |
| commit | 1d78df27294017d464e60bf9b0595e7e42cfca55 (patch) | |
| tree | 49ae667c9d7dfecfd4ecab62a7bd00b3baf5b369 /nixos/modules/services/audio | |
| parent | 3d505a1acd66f22d644919b87e95b91752aef41b (diff) | |
| parent | 44fadbb9bd3e8e49f7d966a8519f5e049aa71fb5 (diff) | |
| download | nixlib-1d78df27294017d464e60bf9b0595e7e42cfca55.tar nixlib-1d78df27294017d464e60bf9b0595e7e42cfca55.tar.gz nixlib-1d78df27294017d464e60bf9b0595e7e42cfca55.tar.bz2 nixlib-1d78df27294017d464e60bf9b0595e7e42cfca55.tar.lz nixlib-1d78df27294017d464e60bf9b0595e7e42cfca55.tar.xz nixlib-1d78df27294017d464e60bf9b0595e7e42cfca55.tar.zst nixlib-1d78df27294017d464e60bf9b0595e7e42cfca55.zip | |
Merge pull request #27000 from Balletie/fix/pulseaudio-alsa-conf
pulseaudio: Resolve conflicting asound.conf of pulseaudio and alsa
Diffstat (limited to 'nixos/modules/services/audio')
| -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"; |