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

SDL: fix on darwin

This commit is contained in:
Henry Till 2015-10-28 19:44:30 -04:00
parent e54c0ddcb0
commit a7784cafa3
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/SDL/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
, OpenGL, CoreAudio, CoreServices, AudioUnit, Kernel, Cocoa
}: }:
# 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
@ -40,7 +41,8 @@ stdenv.mkDerivation rec {
buildInputs = let buildInputs = let
notMingw = !(stdenv ? cross) || stdenv.cross.libc != "msvcrt"; 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 # XXX: By default, SDL wants to dlopen() PulseAudio, in which case
# we must arrange to add it to its RPATH; however, `patchelf' seems # we must arrange to add it to its RPATH; however, `patchelf' seems

3
pkgs/os-specific/darwin/apple-sdk/impure-deps.nix
View File

@ -249,4 +249,7 @@ rec {
SecurityFoundation = [ SecurityFoundation = [
"/System/Library/Frameworks/SecurityFoundation.framework" "/System/Library/Frameworks/SecurityFoundation.framework"
]; ];
Kernel = [
"/System/Library/Frameworks/Kernel.framework"
];
} }

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

@ -8177,6 +8177,7 @@ let
alsaSupport = stdenv.isLinux; alsaSupport = stdenv.isLinux;
x11Support = !stdenv.isCygwin; x11Support = !stdenv.isCygwin;
pulseaudioSupport = stdenv.isLinux; pulseaudioSupport = stdenv.isLinux;
inherit (darwin.apple_sdk.frameworks) OpenGL CoreAudio CoreServices AudioUnit Kernel Cocoa;
}; };
SDL_gfx = callPackage ../development/libraries/SDL_gfx { }; SDL_gfx = callPackage ../development/libraries/SDL_gfx { };