MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-17 23:36:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Modified SDL2 derivation to work on Mac OSX darwin

Browse source 
default to no alsa on darwin
default to no x11 support on darwin
changed asserts to check for darwin
This commit is contained in:
Manuel Adameit 2015-02-08 18:08:14 +01:00
parent b84104a381
commit c7a74ca5c6
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/development/libraries/SDL2/default.nix
View file

@ -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 ];
};
}

4
pkgs/top-level/all-packages.nix
View file

@ -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
};