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

SDL2: add darwin frameworks

Browse Source
This commit is contained in:
Jude Taylor 2015-10-28 12:34:57 -07:00
parent c62cf0b5b3
commit 07849565ed
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/SDL2/default.nix
View File

@ -3,6 +3,7 @@
, alsaSupport ? true, alsaLib ? null , alsaSupport ? true, alsaLib ? null
, x11Support ? true, xlibsWrapper ? null, libXrandr ? null , x11Support ? true, xlibsWrapper ? null, libXrandr ? null
, pulseaudioSupport ? true, libpulseaudio ? null , pulseaudioSupport ? true, libpulseaudio ? null
, AudioUnit, Cocoa, CoreAudio, CoreServices, ForceFeedback, OpenGL
}: }:
# OSS is no longer supported, for it's much crappier than ALSA and # OSS is no longer supported, for it's much crappier than ALSA and
@ -36,7 +37,8 @@ stdenv.mkDerivation rec {
buildInputs = [ pkgconfig audiofile ] ++ buildInputs = [ pkgconfig audiofile ] ++
stdenv.lib.optional openglSupport mesa ++ stdenv.lib.optional openglSupport mesa ++
stdenv.lib.optional alsaSupport alsaLib; stdenv.lib.optional alsaSupport alsaLib ++
stdenv.lib.optionals stdenv.isDarwin [ AudioUnit Cocoa CoreAudio CoreServices ForceFeedback OpenGL ];
# https://bugzilla.libsdl.org/show_bug.cgi?id=1431 # https://bugzilla.libsdl.org/show_bug.cgi?id=1431
dontDisableStatic = true; dontDisableStatic = true;

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

@ -8198,6 +8198,7 @@ let
alsaSupport = stdenv.isLinux; alsaSupport = stdenv.isLinux;
x11Support = !stdenv.isCygwin; x11Support = !stdenv.isCygwin;
pulseaudioSupport = false; # better go through ALSA pulseaudioSupport = false; # better go through ALSA
inherit (darwin.apple_sdk.frameworks) AudioUnit Cocoa CoreAudio CoreServices ForceFeedback OpenGL;
}; };
SDL2_image = callPackage ../development/libraries/SDL2_image { }; SDL2_image = callPackage ../development/libraries/SDL2_image { };