swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-22 05:19:00 +02:00
Code Issues 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
parent 61be2ceb27 b37d5864d6
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
notMingw = !(stdenv ? cross) || stdenv.cross.libc != "msvcrt";
in [ libcap ]
in stdenv.lib.optional stdenv.isLinux libcap
++ (stdenv.lib.optional notMingw audiofile);
nativeBuildInputs = [ pkgconfig ] ++

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

@ -19,6 +19,7 @@ let
--disable-oss --disable-x11-shared
--disable-pulseaudio-shared --disable-alsa-shared
${if alsaSupport then "--with-alsa-prefix=${attrs.alsaLib}/lib" else ""}
${if (!x11Support) then "--without-x" else ""}
'';
in
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;
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 = {
description = "SDL image library";
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;
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);
x11Support = true;
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 { };