diff options
author | Daiderd Jordan <daiderd@gmail.com> | 2017-11-11 12:32:12 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-11-11 12:32:12 +0100 |
commit | 6bedd0b821363236fc970682c895ef05a62218c7 (patch) | |
tree | 109074f1320c47faf53248e5d3bce0756f83da6f | |
parent | 78dd4225e70c89af2771acb1d996961bad886f9e (diff) | |
parent | e19434b4021ae08640f7bae7052f641349294e09 (diff) | |
download | nixlib-6bedd0b821363236fc970682c895ef05a62218c7.tar nixlib-6bedd0b821363236fc970682c895ef05a62218c7.tar.gz nixlib-6bedd0b821363236fc970682c895ef05a62218c7.tar.bz2 nixlib-6bedd0b821363236fc970682c895ef05a62218c7.tar.lz nixlib-6bedd0b821363236fc970682c895ef05a62218c7.tar.xz nixlib-6bedd0b821363236fc970682c895ef05a62218c7.tar.zst nixlib-6bedd0b821363236fc970682c895ef05a62218c7.zip |
Merge pull request #31509 from matthewbauer/disable-sdltest
SDL: try disabling sdltest on darwin
-rw-r--r-- | pkgs/development/libraries/SDL_gfx/default.nix | 3 | ||||
-rw-r--r-- | pkgs/development/libraries/SDL_image/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/libraries/SDL_mixer/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/SDL_net/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/libraries/SDL_ttf/default.nix | 2 |
5 files changed, 11 insertions, 2 deletions
diff --git a/pkgs/development/libraries/SDL_gfx/default.nix b/pkgs/development/libraries/SDL_gfx/default.nix index 0f66f0afb178..1d7d96f7536d 100644 --- a/pkgs/development/libraries/SDL_gfx/default.nix +++ b/pkgs/development/libraries/SDL_gfx/default.nix @@ -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"; diff --git a/pkgs/development/libraries/SDL_image/default.nix b/pkgs/development/libraries/SDL_image/default.nix index 55a4058fe56d..c8cab33ed57f 100644 --- a/pkgs/development/libraries/SDL_image/default.nix +++ b/pkgs/development/libraries/SDL_image/default.nix @@ -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; { diff --git a/pkgs/development/libraries/SDL_mixer/default.nix b/pkgs/development/libraries/SDL_mixer/default.nix index fe64569abbe2..865ddac06bea 100644 --- a/pkgs/development/libraries/SDL_mixer/default.nix +++ b/pkgs/development/libraries/SDL_mixer/default.nix @@ -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"; diff --git a/pkgs/development/libraries/SDL_net/default.nix b/pkgs/development/libraries/SDL_net/default.nix index a159a0691f49..f1c5a5462d11 100644 --- a/pkgs/development/libraries/SDL_net/default.nix +++ b/pkgs/development/libraries/SDL_net/default.nix @@ -11,6 +11,8 @@ stdenv.mkDerivation rec { sha256 = "1d5c9xqlf4s1c01gzv6cxmg0r621pq9kfgxcg3197xw4p25pljjz"; }; + configureFlags = stdenv.lib.optional stdenv.isDarwin "--disable-sdltest"; + propagatedBuildInputs = [ SDL ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/SDL_ttf/default.nix b/pkgs/development/libraries/SDL_ttf/default.nix index 1f290bf7044f..f98e4a3b0ad3 100644 --- a/pkgs/development/libraries/SDL_ttf/default.nix +++ b/pkgs/development/libraries/SDL_ttf/default.nix @@ -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; |