From 05f6e0fdaa0f992027912bd62b57b23b47814581 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Thu, 1 Oct 2015 20:14:52 +0000 Subject: [PATCH] SDL: better pulseaudioSupport logic --- pkgs/top-level/all-packages.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 747932298b8..ae80c4cee1b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8215,7 +8215,9 @@ let openglSupport = mesaSupported; alsaSupport = stdenv.isLinux; x11Support = !stdenv.isCygwin; - pulseaudioSupport = stdenv.isLinux; + pulseaudioSupport = if (config ? pulseaudio) + then config.pulseaudio + else stdenv.isLinux; inherit (darwin.apple_sdk.frameworks) OpenGL CoreAudio CoreServices AudioUnit Kernel Cocoa; }; @@ -8237,7 +8239,7 @@ let openglSupport = mesaSupported; alsaSupport = stdenv.isLinux; x11Support = !stdenv.isCygwin; - pulseaudioSupport = false; # better go through ALSA + pulseaudioSupport = config.pulseaudio or false; # better go through ALSA inherit (darwin.apple_sdk.frameworks) AudioUnit Cocoa CoreAudio CoreServices ForceFeedback OpenGL; };