ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-27 13:57:10 +03:00
Code Issues Projects Releases Wiki Activity

SDL: Build on Darwin

Browse Source
This commit is contained in:
Spencer Whitt 2015-03-05 15:55:59 -05:00
parent eff3fa7949
commit 1cef6dc89a
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/development/libraries/SDL/default.nix
View File

@ -7,7 +7,7 @@
# OSS is no longer supported, for it's much crappier than ALSA and
# PulseAudio.
assert !(stdenv ? cross) -> alsaSupport || pulseaudioSupport;
assert (stdenv.isLinux && !(stdenv ? cross)) -> alsaSupport || pulseaudioSupport;
assert openglSupport -> (mesa != null && x11Support);
assert x11Support -> (x11 != null && libXrandr != null);
@ -51,6 +51,13 @@ stdenv.mkDerivation rec {
"--without-x"
] ++ stdenv.lib.optional alsaSupport "--with-alsa-prefix=${alsaLib}/lib");
# Fix a build failure on OS X Mavericks
# Ticket: https://bugzilla.libsdl.org/show_bug.cgi?id=2085
patches = stdenv.lib.optional stdenv.isDarwin [ (fetchurl {
url = "http://bugzilla-attachments.libsdl.org/attachment.cgi?id=1320";
sha1 = "3137feb503a89a8d606405373905b92dcf7e293b";
}) ];
crossAttrs =stdenv.lib.optionalAttrs (stdenv.cross.libc == "libSystem") {
patches = let
f = rev: sha256: fetchurl {
@ -72,6 +79,6 @@ stdenv.mkDerivation rec {
description = "A cross-platform multimedia library";
homepage = http://www.libsdl.org/;
maintainers = with maintainers; [ lovek323 ];
platforms = platforms.linux;
platforms = platforms.unix;
};
}

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

@ -7357,7 +7357,7 @@ let
openglSupport = mesaSupported;
alsaSupport = (!stdenv.isDarwin);
x11Support = true;
pulseaudioSupport = true;
pulseaudioSupport = (!stdenv.isDarwin);
# resolve the unrecognized -fpascal-strings option error
stdenv = if stdenv.isDarwin