From a7784cafa3a488a30e8cba4b48bd737610bd5a93 Mon Sep 17 00:00:00 2001 From: Henry Till Date: Wed, 28 Oct 2015 19:44:30 -0400 Subject: [PATCH] SDL: fix on darwin --- pkgs/development/libraries/SDL/default.nix | 4 +++- pkgs/os-specific/darwin/apple-sdk/impure-deps.nix | 3 +++ pkgs/top-level/all-packages.nix | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/SDL/default.nix b/pkgs/development/libraries/SDL/default.nix index ac895b5113e..7006eb10f7e 100644 --- a/pkgs/development/libraries/SDL/default.nix +++ b/pkgs/development/libraries/SDL/default.nix @@ -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 diff --git a/pkgs/os-specific/darwin/apple-sdk/impure-deps.nix b/pkgs/os-specific/darwin/apple-sdk/impure-deps.nix index 62bd63fabb2..b3155b447ac 100644 --- a/pkgs/os-specific/darwin/apple-sdk/impure-deps.nix +++ b/pkgs/os-specific/darwin/apple-sdk/impure-deps.nix @@ -249,4 +249,7 @@ rec { SecurityFoundation = [ "/System/Library/Frameworks/SecurityFoundation.framework" ]; + Kernel = [ + "/System/Library/Frameworks/Kernel.framework" + ]; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3479ba9b8f8..d072e7e1824 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { };