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

SDL2: disable sdltest on darwin

Browse Source 
Darwin headless will hang when trying to run the SDL test program.
This commit is contained in:
Matthew Bauer 2018-06-06 19:18:00 -04:00
parent dfc4744afd
commit 08c6c6beb4
6 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -55,7 +55,8 @@ stdenv.mkDerivation rec {
configureFlags = [ configureFlags = [
"--disable-oss" "--disable-oss"
] ++ optional (!x11Support) "--without-x" ] ++ optional (!x11Support) "--without-x"
++ optional alsaSupport "--with-alsa-prefix=${alsaLib.out}/lib"; ++ optional alsaSupport "--with-alsa-prefix=${alsaLib.out}/lib"
++ optional stdenv.isDarwin "--disable-sdltest";
postInstall = '' postInstall = ''
moveToOutput lib/libSDL2main.a "$dev" moveToOutput lib/libSDL2main.a "$dev"

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

@ -13,7 +13,8 @@ stdenv.mkDerivation rec {
buildInputs = [ SDL2 ] buildInputs = [ SDL2 ]
++ stdenv.lib.optional stdenv.isDarwin darwin.libobjc; ++ stdenv.lib.optional stdenv.isDarwin darwin.libobjc;
configureFlags = if stdenv.isi686 || stdenv.isx86_64 then "--enable-mmx" else "--disable-mmx"; configureFlags = [(if stdenv.isi686 || stdenv.isx86_64 then "--enable-mmx" else "--disable-mmx")]
++ stdenv.lib.optional stdenv.isDarwin "--disable-sdltest";
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "SDL graphics drawing primitives and support functions"; description = "SDL graphics drawing primitives and support functions";

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

@ -12,6 +12,9 @@ stdenv.mkDerivation rec {
buildInputs = [ SDL2 libpng libjpeg libtiff libungif libXpm zlib ] buildInputs = [ SDL2 libpng libjpeg libtiff libungif libXpm zlib ]
++ stdenv.lib.optional stdenv.isDarwin Foundation; ++ stdenv.lib.optional stdenv.isDarwin Foundation;
configureFlags = stdenv.lib.optional stdenv.isDarwin "--disable-sdltest";
enableParallelBuilding = true; enableParallelBuilding = true;
meta = with stdenv.lib; { meta = with stdenv.lib; {

3
pkgs/development/libraries/SDL2_mixer/default.nix
View File

@ -23,7 +23,8 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = [ SDL2 libogg libvorbis fluidsynth smpeg2 flac libmodplug ]; propagatedBuildInputs = [ SDL2 libogg libvorbis fluidsynth smpeg2 flac libmodplug ];
configureFlags = [ "--disable-music-ogg-shared" ] configureFlags = [ "--disable-music-ogg-shared" ]
++ lib.optional enableNativeMidi "--enable-music-native-midi-gpl"; ++ lib.optional enableNativeMidi "--enable-music-native-midi-gpl"
++ lib.optionals stdenv.isDarwin [ "--disable-sdltest" "--disable-smpegtest" ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "SDL multi-channel audio mixer library"; description = "SDL multi-channel audio mixer library";

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

@ -11,6 +11,8 @@ stdenv.mkDerivation rec {
buildInputs = stdenv.lib.optional stdenv.isDarwin darwin.libobjc; buildInputs = stdenv.lib.optional stdenv.isDarwin darwin.libobjc;
configureFlags = stdenv.lib.optional stdenv.isDarwin "--disable-sdltest";
propagatedBuildInputs = [ SDL2 ]; propagatedBuildInputs = [ SDL2 ];
meta = with stdenv.lib; { meta = with stdenv.lib; {

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

@ -9,6 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "0xljwcpvd2knrjdfag5b257xqayplz55mqlszrqp0kpnphh5xnrl"; sha256 = "0xljwcpvd2knrjdfag5b257xqayplz55mqlszrqp0kpnphh5xnrl";
}; };
configureFlags = stdenv.lib.optional stdenv.isDarwin "--disable-sdltest";
buildInputs = [ SDL2 freetype libGL ] buildInputs = [ SDL2 freetype libGL ]
++ stdenv.lib.optional stdenv.isDarwin darwin.libobjc; ++ stdenv.lib.optional stdenv.isDarwin darwin.libobjc;