public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #7637 from spwhitt/sdl

Browse Source 
SDL*: Fix on Darwin
This commit is contained in:
Daniel Peebles 2015-05-08 01:16:39 -04:00
commit b1a217ec55
6 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
buildInputs = let buildInputs = let
notMingw = !(stdenv ? cross) || stdenv.cross.libc != "msvcrt"; notMingw = !(stdenv ? cross) || stdenv.cross.libc != "msvcrt";
in [ libcap ] in stdenv.lib.optional stdenv.isLinux libcap
++ (stdenv.lib.optional notMingw audiofile); ++ (stdenv.lib.optional notMingw audiofile);
nativeBuildInputs = [ pkgconfig ] ++ nativeBuildInputs = [ pkgconfig ] ++

1
pkgs/development/libraries/SDL2/default.nix
View File

@ -19,6 +19,7 @@ let
--disable-oss --disable-x11-shared --disable-oss --disable-x11-shared
--disable-pulseaudio-shared --disable-alsa-shared --disable-pulseaudio-shared --disable-alsa-shared
${if alsaSupport then "--with-alsa-prefix=${attrs.alsaLib}/lib" else ""} ${if alsaSupport then "--with-alsa-prefix=${attrs.alsaLib}/lib" else ""}
${if (!x11Support) then "--without-x" else ""}
''; '';
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {

2
pkgs/development/libraries/SDL2_gfx/default.nix
View File

@ -49,6 +49,6 @@ stdenv.mkDerivation rec {
license = stdenv.lib.licenses.lgpl2Plus; license = stdenv.lib.licenses.lgpl2Plus;
maintainers = [ stdenv.lib.maintainers.bjg ]; maintainers = [ stdenv.lib.maintainers.bjg ];
platforms = stdenv.lib.platforms.linux; platforms = stdenv.lib.platforms.unix;
}; };
} }

2
pkgs/development/libraries/SDL2_image/default.nix
View File

@ -22,6 +22,6 @@ stdenv.mkDerivation rec {
meta = { meta = {
description = "SDL image library"; description = "SDL image library";
homepage = "http://www.libsdl.org/projects/SDL_image/"; homepage = "http://www.libsdl.org/projects/SDL_image/";
platforms = stdenv.lib.platforms.linux; platforms = stdenv.lib.platforms.unix;
}; };
} }

2
pkgs/development/libraries/SDL_gfx/default.nix
View File

@ -44,6 +44,6 @@ stdenv.mkDerivation rec {
license = stdenv.lib.licenses.lgpl2Plus; license = stdenv.lib.licenses.lgpl2Plus;
maintainers = [ stdenv.lib.maintainers.bjg ]; maintainers = [ stdenv.lib.maintainers.bjg ];
platforms = stdenv.lib.platforms.linux; platforms = stdenv.lib.platforms.unix;
}; };
} }

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

@ -7579,11 +7579,6 @@ let
alsaSupport = (!stdenv.isDarwin); alsaSupport = (!stdenv.isDarwin);
x11Support = true; x11Support = true;
pulseaudioSupport = (!stdenv.isDarwin); pulseaudioSupport = (!stdenv.isDarwin);
# resolve the unrecognized -fpascal-strings option error
stdenv = if stdenv.isDarwin
then clangStdenv
else stdenv;
}; };
SDL_gfx = callPackage ../development/libraries/SDL_gfx { }; SDL_gfx = callPackage ../development/libraries/SDL_gfx { };