From 08c6c6beb46be071202c3973e4f2f2959af13c93 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Wed, 6 Jun 2018 19:18:00 -0400
Subject: [PATCH] SDL2: disable sdltest on darwin
Darwin headless will hang when trying to run the SDL test program.
---
pkgs/development/libraries/SDL2/default.nix | 3 ++-
pkgs/development/libraries/SDL2_gfx/default.nix | 3 ++-
pkgs/development/libraries/SDL2_image/default.nix | 3 +++
pkgs/development/libraries/SDL2_mixer/default.nix | 3 ++-
pkgs/development/libraries/SDL2_net/default.nix | 2 ++
pkgs/development/libraries/SDL2_ttf/default.nix | 2 ++
6 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix
index d852b594f6dd..c32f59636a92 100644
--- a/pkgs/development/libraries/SDL2/default.nix
+++ b/pkgs/development/libraries/SDL2/default.nix
@@ -55,7 +55,8 @@ stdenv.mkDerivation rec {
configureFlags = [
"--disable-oss"
] ++ 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 = ''
moveToOutput lib/libSDL2main.a "$dev"
diff --git a/pkgs/development/libraries/SDL2_gfx/default.nix b/pkgs/development/libraries/SDL2_gfx/default.nix
index 04ec3f9652c2..803cc97a8ae8 100644
--- a/pkgs/development/libraries/SDL2_gfx/default.nix
+++ b/pkgs/development/libraries/SDL2_gfx/default.nix
@@ -13,7 +13,8 @@ stdenv.mkDerivation rec {
buildInputs = [ SDL2 ]
++ 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; {
description = "SDL graphics drawing primitives and support functions";
diff --git a/pkgs/development/libraries/SDL2_image/default.nix b/pkgs/development/libraries/SDL2_image/default.nix
index b0f2d0e8b8d1..ea5f37513afb 100644
--- a/pkgs/development/libraries/SDL2_image/default.nix
+++ b/pkgs/development/libraries/SDL2_image/default.nix
@@ -12,6 +12,9 @@ stdenv.mkDerivation rec {
buildInputs = [ SDL2 libpng libjpeg libtiff libungif libXpm zlib ]
++ stdenv.lib.optional stdenv.isDarwin Foundation;
+
+ configureFlags = stdenv.lib.optional stdenv.isDarwin "--disable-sdltest";
+
enableParallelBuilding = true;
meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/SDL2_mixer/default.nix b/pkgs/development/libraries/SDL2_mixer/default.nix
index 00251adb9153..f31fe33ea096 100644
--- a/pkgs/development/libraries/SDL2_mixer/default.nix
+++ b/pkgs/development/libraries/SDL2_mixer/default.nix
@@ -23,7 +23,8 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = [ SDL2 libogg libvorbis fluidsynth smpeg2 flac libmodplug ];
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; {
description = "SDL multi-channel audio mixer library";
diff --git a/pkgs/development/libraries/SDL2_net/default.nix b/pkgs/development/libraries/SDL2_net/default.nix
index 780444d51f4f..5cadfb9d9051 100644
--- a/pkgs/development/libraries/SDL2_net/default.nix
+++ b/pkgs/development/libraries/SDL2_net/default.nix
@@ -11,6 +11,8 @@ stdenv.mkDerivation rec {
buildInputs = stdenv.lib.optional stdenv.isDarwin darwin.libobjc;
+ configureFlags = stdenv.lib.optional stdenv.isDarwin "--disable-sdltest";
+
propagatedBuildInputs = [ SDL2 ];
meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/SDL2_ttf/default.nix b/pkgs/development/libraries/SDL2_ttf/default.nix
index 4558317ce3e3..a21315fdc882 100644
--- a/pkgs/development/libraries/SDL2_ttf/default.nix
+++ b/pkgs/development/libraries/SDL2_ttf/default.nix
@@ -9,6 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "0xljwcpvd2knrjdfag5b257xqayplz55mqlszrqp0kpnphh5xnrl";
};
+ configureFlags = stdenv.lib.optional stdenv.isDarwin "--disable-sdltest";
+
buildInputs = [ SDL2 freetype libGL ]
++ stdenv.lib.optional stdenv.isDarwin darwin.libobjc;