diff options
| author | Orivej Desh <orivej@gmx.fr> | 2018-06-03 19:43:24 +0000 |
|---|---|---|
| committer | Orivej Desh <orivej@gmx.fr> | 2018-06-03 20:00:40 +0000 |
| commit | 96606abf82caafb6defbe32a91b4ec14deaa1740 (patch) | |
| tree | e62bc66268b9bb8ec647e1899a7ebe41f312799a /pkgs/development/libraries/SDL | |
| parent | b3e7923b94bb99cebb699bcd75486aa1e277dfe2 (diff) | |
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.
Diffstat (limited to 'pkgs/development/libraries/SDL')
| -rw-r--r-- | pkgs/development/libraries/SDL/default.nix | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/development/libraries/SDL/default.nix b/pkgs/development/libraries/SDL/default.nix index 7e96cf84686fb..d40b25cd80406 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/"; |