Merge pull request #31509 from matthewbauer/disable-sdltest

SDL: try disabling sdltest on darwin
This commit is contained in:
Daiderd Jordan 2017-11-11 12:32:12 +01:00 committed by GitHub
commit 6bedd0b821
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 11 additions and 2 deletions

View file

@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
buildInputs = [ SDL ] ;
configureFlags = [ "--disable-mmx" ];
configureFlags = [ "--disable-mmx" ]
++ stdenv.lib.optional stdenv.isDarwin "--disable-sdltest";
meta = with stdenv.lib; {
description = "SDL graphics drawing primitives and support functions";

View file

@ -17,6 +17,8 @@ stdenv.mkDerivation rec {
})
];
configureFlags = stdenv.lib.optional stdenv.isDarwin "--disable-sdltest";
buildInputs = [ SDL libpng libjpeg libtiff libungif libXpm ];
meta = with stdenv.lib; {

View file

@ -12,7 +12,9 @@ stdenv.mkDerivation rec {
buildInputs = [ SDL libogg libvorbis fluidsynth smpeg ];
configureFlags = [ "--disable-music-ogg-shared" ] ++ lib.optional enableNativeMidi " --enable-music-native-midi-gpl";
configureFlags = [ "--disable-music-ogg-shared" ]
++ lib.optional enableNativeMidi " --enable-music-native-midi-gpl"
++ lib.optional stdenv.isDarwin "--disable-sdltest";
meta = with stdenv.lib; {
description = "SDL multi-channel audio mixer library";

View file

@ -11,6 +11,8 @@ stdenv.mkDerivation rec {
sha256 = "1d5c9xqlf4s1c01gzv6cxmg0r621pq9kfgxcg3197xw4p25pljjz";
};
configureFlags = stdenv.lib.optional stdenv.isDarwin "--disable-sdltest";
propagatedBuildInputs = [ SDL ];
meta = with stdenv.lib; {

View file

@ -21,6 +21,8 @@ stdenv.mkDerivation rec {
buildInputs = [ SDL freetype ];
configureFlags = stdenv.lib.optional stdenv.isDarwin "--disable-sdltest";
meta = with stdenv.lib; {
description = "SDL TrueType library";
license = licenses.zlib;