Skip to content

Commit

Permalink
SDL: try disabling sdltest on darwin
Browse files Browse the repository at this point in the history
(cherry picked from commit e19434b)
  • Loading branch information
matthewbauer authored and LnL7 committed Nov 11, 2017
1 parent 68efaea commit 4587b7e
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 2 deletions.
3 changes: 2 additions & 1 deletion pkgs/development/libraries/SDL_gfx/default.nix
Expand Up @@ -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";
Expand Down
2 changes: 2 additions & 0 deletions pkgs/development/libraries/SDL_image/default.nix
Expand Up @@ -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; {
Expand Down
4 changes: 3 additions & 1 deletion pkgs/development/libraries/SDL_mixer/default.nix
Expand Up @@ -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";
Expand Down
2 changes: 2 additions & 0 deletions pkgs/development/libraries/SDL_net/default.nix
Expand Up @@ -11,6 +11,8 @@ stdenv.mkDerivation rec {
sha256 = "1d5c9xqlf4s1c01gzv6cxmg0r621pq9kfgxcg3197xw4p25pljjz";
};

configureFlags = stdenv.lib.optional stdenv.isDarwin "--disable-sdltest";

propagatedBuildInputs = [ SDL ];

meta = with stdenv.lib; {
Expand Down
2 changes: 2 additions & 0 deletions pkgs/development/libraries/SDL_ttf/default.nix
Expand Up @@ -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;
Expand Down

0 comments on commit 4587b7e

Please sign in to comment.