mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-11-10 16:45:51 +03:00
Merge pull request #10680 from henrytill/SDL-darwin-fix
SDL: fix on darwin
This commit is contained in:
commit
b5c14e4e8e
@ -3,6 +3,7 @@
|
||||
, alsaSupport ? true, alsaLib ? null
|
||||
, x11Support ? true, xlibsWrapper ? null, libXrandr ? null
|
||||
, pulseaudioSupport ? true, libpulseaudio ? null
|
||||
, OpenGL, CoreAudio, CoreServices, AudioUnit, Kernel, Cocoa
|
||||
}:
|
||||
|
||||
# OSS is no longer supported, for it's much crappier than ALSA and
|
||||
@ -40,7 +41,8 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs = let
|
||||
notMingw = !(stdenv ? cross) || stdenv.cross.libc != "msvcrt";
|
||||
in optional notMingw audiofile;
|
||||
in optional notMingw audiofile
|
||||
++ optionals stdenv.isDarwin [ OpenGL CoreAudio CoreServices AudioUnit Kernel Cocoa ];
|
||||
|
||||
# XXX: By default, SDL wants to dlopen() PulseAudio, in which case
|
||||
# we must arrange to add it to its RPATH; however, `patchelf' seems
|
||||
|
@ -249,4 +249,7 @@ rec {
|
||||
SecurityFoundation = [
|
||||
"/System/Library/Frameworks/SecurityFoundation.framework"
|
||||
];
|
||||
Kernel = [
|
||||
"/System/Library/Frameworks/Kernel.framework"
|
||||
];
|
||||
}
|
||||
|
@ -8177,6 +8177,7 @@ let
|
||||
alsaSupport = stdenv.isLinux;
|
||||
x11Support = !stdenv.isCygwin;
|
||||
pulseaudioSupport = stdenv.isLinux;
|
||||
inherit (darwin.apple_sdk.frameworks) OpenGL CoreAudio CoreServices AudioUnit Kernel Cocoa;
|
||||
};
|
||||
|
||||
SDL_gfx = callPackage ../development/libraries/SDL_gfx { };
|
||||
|
Loading…
Reference in New Issue
Block a user