public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SDL: propagate libiconv

Browse Source 
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:
Orivej Desh 2018-06-03 19:43:24 +00:00
parent b3e7923b94
commit 96606abf82
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/libraries/SDL/default.nix
View File

@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
propagatedBuildInputs = [ ] propagatedBuildInputs = [ libiconv ]
++ optionals x11Support [ libXext libICE libXrandr ] ++ optionals x11Support [ libXext libICE libXrandr ]
++ optional stdenv.isLinux libcap ++ optional stdenv.isLinux libcap
++ optionals openglSupport [ libGL libGLU ] ++ optionals openglSupport [ libGL libGLU ]
@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
++ optional pulseaudioSupport libpulseaudio ++ optional pulseaudioSupport libpulseaudio
++ optional stdenv.isDarwin Cocoa; ++ optional stdenv.isDarwin Cocoa;
buildInputs = [ libiconv ] buildInputs = [ ]
++ optional (!hostPlatform.isMinGW) audiofile ++ optional (!hostPlatform.isMinGW) audiofile
++ optionals stdenv.isDarwin [ AudioUnit CoreAudio CoreServices Kernel OpenGL ]; ++ optionals stdenv.isDarwin [ AudioUnit CoreAudio CoreServices Kernel OpenGL ];
@ -119,6 +119,8 @@ stdenv.mkDerivation rec {
passthru = { inherit openglSupport; }; passthru = { inherit openglSupport; };
enableParallelBuilding = true;
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "A cross-platform multimedia library"; description = "A cross-platform multimedia library";
homepage = "http://www.libsdl.org/"; homepage = "http://www.libsdl.org/";