diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2017-11-10 19:22:15 -0600 |
|---|---|---|
| committer | Matthew Bauer <mjbauer95@gmail.com> | 2017-11-10 19:22:15 -0600 |
| commit | e19434b4021ae08640f7bae7052f641349294e09 (patch) | |
| tree | a792594ee3e8df8fc270ac684535a1bf163cee8e | |
| parent | cd722e1678864f019096f2dcceca4afabe6ff87c (diff) | |
| download | nixpkgs-e19434b4021ae08640f7bae7052f641349294e09.tar nixpkgs-e19434b4021ae08640f7bae7052f641349294e09.tar.gz nixpkgs-e19434b4021ae08640f7bae7052f641349294e09.tar.bz2 nixpkgs-e19434b4021ae08640f7bae7052f641349294e09.tar.lz nixpkgs-e19434b4021ae08640f7bae7052f641349294e09.tar.xz nixpkgs-e19434b4021ae08640f7bae7052f641349294e09.tar.zst nixpkgs-e19434b4021ae08640f7bae7052f641349294e09.zip | |
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 0f66f0afb17..1d7d96f7536 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 55a4058fe56..c8cab33ed57 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 fe64569abbe..865ddac06be 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 a159a0691f4..f1c5a5462d1 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 1f290bf7044..f98e4a3b0ad 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; |