public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #10994 from oxij/sdl-pulseaudio

Browse Source 
SDL: better pulseaudioSupport logic
This commit is contained in:
Arseniy Seroka 2015-11-13 17:39:30 +03:00
commit 9ea4e30327
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/top-level/all-packages.nix
View File

@ -8217,7 +8217,9 @@ let
openglSupport = mesaSupported; openglSupport = mesaSupported;
alsaSupport = stdenv.isLinux; alsaSupport = stdenv.isLinux;
x11Support = !stdenv.isCygwin; 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; inherit (darwin.apple_sdk.frameworks) OpenGL CoreAudio CoreServices AudioUnit Kernel Cocoa;
}; };
@ -8239,7 +8241,7 @@ let
openglSupport = mesaSupported; openglSupport = mesaSupported;
alsaSupport = stdenv.isLinux; alsaSupport = stdenv.isLinux;
x11Support = !stdenv.isCygwin; 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; inherit (darwin.apple_sdk.frameworks) AudioUnit Cocoa CoreAudio CoreServices ForceFeedback OpenGL;
}; };