From 96606abf82caafb6defbe32a91b4ec14deaa1740 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Sun, 3 Jun 2018 19:43:24 +0000 Subject: [PATCH] SDL: propagate libiconv SDL/SDL.h includes SDL/SDL_stdinc.h which includes iconv.h, therefore all packages that include SDL.h should be able to include iconv.h Fixes SDL_gfx, SDL_image etc. on Darwin. --- pkgs/development/libraries/SDL/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/SDL/default.nix b/pkgs/development/libraries/SDL/default.nix index 7e96cf84686..d40b25cd804 100644 --- a/pkgs/development/libraries/SDL/default.nix +++ b/pkgs/development/libraries/SDL/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; - propagatedBuildInputs = [ ] + propagatedBuildInputs = [ libiconv ] ++ optionals x11Support [ libXext libICE libXrandr ] ++ optional stdenv.isLinux libcap ++ optionals openglSupport [ libGL libGLU ] @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { ++ optional pulseaudioSupport libpulseaudio ++ optional stdenv.isDarwin Cocoa; - buildInputs = [ libiconv ] + buildInputs = [ ] ++ optional (!hostPlatform.isMinGW) audiofile ++ optionals stdenv.isDarwin [ AudioUnit CoreAudio CoreServices Kernel OpenGL ]; @@ -119,6 +119,8 @@ stdenv.mkDerivation rec { passthru = { inherit openglSupport; }; + enableParallelBuilding = true; + meta = with stdenv.lib; { description = "A cross-platform multimedia library"; homepage = "http://www.libsdl.org/";