mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-30 10:53:11 +00:00
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.
This commit is contained in:
parent
b3e7923b94
commit
96606abf82
@ -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/";
|
||||
|
Loading…
Reference in New Issue
Block a user