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/config | |
| parent | 3d505a1acd66f22d644919b87e95b91752aef41b (diff) | |
| parent | 44fadbb9bd3e8e49f7d966a8519f5e049aa71fb5 (diff) | |
| download | nixpkgs-1d78df27294017d464e60bf9b0595e7e42cfca55.tar nixpkgs-1d78df27294017d464e60bf9b0595e7e42cfca55.tar.gz nixpkgs-1d78df27294017d464e60bf9b0595e7e42cfca55.tar.bz2 nixpkgs-1d78df27294017d464e60bf9b0595e7e42cfca55.tar.lz nixpkgs-1d78df27294017d464e60bf9b0595e7e42cfca55.tar.xz nixpkgs-1d78df27294017d464e60bf9b0595e7e42cfca55.tar.zst nixpkgs-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/config')
| -rw-r--r-- | nixos/modules/config/pulseaudio.nix | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/nixos/modules/config/pulseaudio.nix b/nixos/modules/config/pulseaudio.nix index bd80c811348..b12ef2fe861 100644 --- a/nixos/modules/config/pulseaudio.nix +++ b/nixos/modules/config/pulseaudio.nix @@ -6,6 +6,7 @@ with lib; let cfg = config.hardware.pulseaudio; + alsaCfg = config.sound; systemWide = cfg.enable && cfg.systemWide; nonSystemWide = cfg.enable && !cfg.systemWide; @@ -76,6 +77,7 @@ let ctl.!default { type pulse } + ${alsaCfg.extraConfig} ''); in { |