diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-10-16 15:16:50 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-10-16 15:16:50 +0200 |
| commit | 09dc132e04c8a69581becb56a1c5e1bfee3aef7e (patch) | |
| tree | 186745725ff42ea953572f38eaca71161fee9406 /nixos/modules/config/pulseaudio.nix | |
| parent | 3c6efec2c09e9389eb973ec5e45cb8e04b35f8aa (diff) | |
| parent | e39bf7a7043a466761754c423b3d5783a320a6ce (diff) | |
| download | nixlib-09dc132e04c8a69581becb56a1c5e1bfee3aef7e.tar nixlib-09dc132e04c8a69581becb56a1c5e1bfee3aef7e.tar.gz nixlib-09dc132e04c8a69581becb56a1c5e1bfee3aef7e.tar.bz2 nixlib-09dc132e04c8a69581becb56a1c5e1bfee3aef7e.tar.lz nixlib-09dc132e04c8a69581becb56a1c5e1bfee3aef7e.tar.xz nixlib-09dc132e04c8a69581becb56a1c5e1bfee3aef7e.tar.zst nixlib-09dc132e04c8a69581becb56a1c5e1bfee3aef7e.zip | |
Merge remote-tracking branch 'origin/master' into staging
Conflicts: pkgs/development/libraries/poppler/default.nix
Diffstat (limited to 'nixos/modules/config/pulseaudio.nix')
| -rw-r--r-- | nixos/modules/config/pulseaudio.nix | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/nixos/modules/config/pulseaudio.nix b/nixos/modules/config/pulseaudio.nix index 737f0abc52f0..8b38489a8c19 100644 --- a/nixos/modules/config/pulseaudio.nix +++ b/nixos/modules/config/pulseaudio.nix @@ -12,7 +12,7 @@ let # Forces 32bit pulseaudio and alsaPlugins to be built/supported for apps # using 32bit alsa on 64bit linux. - enable32BitAlsaPlugins = stdenv.isx86_64 && (pkgs_i686.alsaLib != null); + enable32BitAlsaPlugins = stdenv.isx86_64 && (pkgs_i686.alsaLib != null && pkgs_i686.pulseaudio != null); ids = config.ids; @@ -126,8 +126,7 @@ in { (mkIf cfg.enable { environment.systemPackages = [ cfg.package - (lib.optional enable32BitAlsaPlugins pkgs_i686.pulseaudio) - ]; + ] ++ lib.optionals enable32BitAlsaPlugins [ pkgs_i686.pulseaudio ]; environment.etc = singleton { target = "asound.conf"; |