From 07849565ed0956acb0040ff39bd670a4025d7114 Mon Sep 17 00:00:00 2001 From: Jude Taylor Date: Wed, 28 Oct 2015 12:34:57 -0700 Subject: [PATCH] SDL2: add darwin frameworks --- pkgs/development/libraries/SDL2/default.nix | 4 +++- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix index 7573d1e1cd2..529c485930b 100644 --- a/pkgs/development/libraries/SDL2/default.nix +++ b/pkgs/development/libraries/SDL2/default.nix @@ -3,6 +3,7 @@ , alsaSupport ? true, alsaLib ? null , x11Support ? true, xlibsWrapper ? null, libXrandr ? null , pulseaudioSupport ? true, libpulseaudio ? null +, AudioUnit, Cocoa, CoreAudio, CoreServices, ForceFeedback, OpenGL }: # OSS is no longer supported, for it's much crappier than ALSA and @@ -36,7 +37,8 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig audiofile ] ++ 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 dontDisableStatic = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2a8d2d5a965..63df9aa0553 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8198,6 +8198,7 @@ let alsaSupport = stdenv.isLinux; x11Support = !stdenv.isCygwin; pulseaudioSupport = false; # better go through ALSA + inherit (darwin.apple_sdk.frameworks) AudioUnit Cocoa CoreAudio CoreServices ForceFeedback OpenGL; }; SDL2_image = callPackage ../development/libraries/SDL2_image { };