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

SDL: add libiconv to fix build

Browse Source
This commit is contained in:
Will Dietz 2017-05-28 13:52:30 -05:00
parent 0e15473fd1
commit 2e2517c9c9
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
{ stdenv, fetchurl, fetchpatch, pkgconfig, audiofile, libcap { stdenv, fetchurl, fetchpatch, pkgconfig, audiofile, libcap, libiconv
, openglSupport ? false, mesa_noglu, mesa_glu , openglSupport ? false, mesa_noglu, mesa_glu
, alsaSupport ? true, alsaLib , alsaSupport ? true, alsaLib
, x11Support ? hostPlatform == buildPlatform, libXext, libICE, libXrandr , x11Support ? hostPlatform == buildPlatform, libXext, libICE, libXrandr
@ -40,7 +40,8 @@ stdenv.mkDerivation rec {
buildInputs = let buildInputs = let
notMingw = !hostPlatform.isMinGW; notMingw = !hostPlatform.isMinGW;
in optional notMingw audiofile in optional notMingw audiofile
++ optionals stdenv.isDarwin [ OpenGL CoreAudio CoreServices AudioUnit Kernel ]; ++ optionals stdenv.isDarwin [ OpenGL CoreAudio CoreServices AudioUnit Kernel ]
++ [ libiconv ];
# XXX: By default, SDL wants to dlopen() PulseAudio, in which case # XXX: By default, SDL wants to dlopen() PulseAudio, in which case
# we must arrange to add it to its RPATH; however, `patchelf' seems # we must arrange to add it to its RPATH; however, `patchelf' seems

4
pkgs/development/libraries/SDL2/default.nix
View File

@ -8,6 +8,7 @@
, ibusSupport ? false, ibus , ibusSupport ? false, ibus
, pulseaudioSupport ? true, libpulseaudio , pulseaudioSupport ? true, libpulseaudio
, AudioUnit, Cocoa, CoreAudio, CoreServices, ForceFeedback, OpenGL , AudioUnit, Cocoa, CoreAudio, CoreServices, ForceFeedback, OpenGL
, libiconv
}: }:
# OSS is no longer supported, for it's much crappier than ALSA and # OSS is no longer supported, for it's much crappier than ALSA and
@ -41,7 +42,8 @@ stdenv.mkDerivation rec {
# Since `libpulse*.la' contain `-lgdbm', PulseAudio must be propagated. # Since `libpulse*.la' contain `-lgdbm', PulseAudio must be propagated.
propagatedBuildInputs = lib.optionals x11Support [ libICE libXi libXScrnSaver libXcursor libXinerama libXext libXrandr libXxf86vm ] ++ propagatedBuildInputs = lib.optionals x11Support [ libICE libXi libXScrnSaver libXcursor libXinerama libXext libXrandr libXxf86vm ] ++
lib.optionals waylandSupport [ wayland wayland-protocols libxkbcommon ] ++ lib.optionals waylandSupport [ wayland wayland-protocols libxkbcommon ] ++
lib.optional pulseaudioSupport libpulseaudio; lib.optional pulseaudioSupport libpulseaudio
++ [ libiconv ];
buildInputs = [ audiofile ] ++ buildInputs = [ audiofile ] ++
lib.optional openglSupport mesa_noglu ++ lib.optional openglSupport mesa_noglu ++