From c7a74ca5c613761cbe661f0281cda4e90cf614ce Mon Sep 17 00:00:00 2001 From: Manuel Adameit Date: Sun, 8 Feb 2015 18:08:14 +0100 Subject: [PATCH] Modified SDL2 derivation to work on Mac OSX darwin default to no alsa on darwin default to no x11 support on darwin changed asserts to check for darwin --- pkgs/development/libraries/SDL2/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix index b122248bb231..68f40cad2598 100644 --- a/pkgs/development/libraries/SDL2/default.nix +++ b/pkgs/development/libraries/SDL2/default.nix @@ -7,9 +7,9 @@ # OSS is no longer supported, for it's much crappier than ALSA and # PulseAudio. -assert alsaSupport || pulseaudioSupport; +assert !stdenv.isDarwin -> alsaSupport || pulseaudioSupport; -assert openglSupport -> (mesa != null && x11Support); +assert openglSupport -> (stdenv.isDarwin || mesa != null && x11Support); assert x11Support -> (x11 != null && libXrandr != null); assert alsaSupport -> alsaLib != null; assert pulseaudioSupport -> pulseaudio != null; @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { description = "A cross-platform multimedia library"; homepage = http://www.libsdl.org/; license = stdenv.lib.licenses.zlib; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.all; maintainers = [ stdenv.lib.maintainers.page ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4016b6dc2ea2..253872a2be1d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7146,8 +7146,8 @@ let SDL2 = callPackage ../development/libraries/SDL2 { openglSupport = mesaSupported; - alsaSupport = true; - x11Support = true; + alsaSupport = (!stdenv.isDarwin); + x11Support = (!stdenv.isDarwin); pulseaudioSupport = false; # better go through ALSA };