diff options
author | Will Dietz <w@wdtz.org> | 2017-05-28 13:52:30 -0500 |
---|---|---|
committer | Will Dietz <w@wdtz.org> | 2018-02-13 09:44:54 -0600 |
commit | 2e2517c9c94fce696c7d85f76547d0aca2cdff3f (patch) | |
tree | 08a8c9c05b0dcb404c0dcf14a984f0b084a7369d /pkgs | |
parent | 0e15473fd185c9284a41499efc51df9a01a5a578 (diff) | |
download | nixpkgs-2e2517c9c94fce696c7d85f76547d0aca2cdff3f.tar nixpkgs-2e2517c9c94fce696c7d85f76547d0aca2cdff3f.tar.gz nixpkgs-2e2517c9c94fce696c7d85f76547d0aca2cdff3f.tar.bz2 nixpkgs-2e2517c9c94fce696c7d85f76547d0aca2cdff3f.tar.lz nixpkgs-2e2517c9c94fce696c7d85f76547d0aca2cdff3f.tar.xz nixpkgs-2e2517c9c94fce696c7d85f76547d0aca2cdff3f.tar.zst nixpkgs-2e2517c9c94fce696c7d85f76547d0aca2cdff3f.zip |
SDL: add libiconv to fix build
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/libraries/SDL/default.nix | 5 | ||||
-rw-r--r-- | pkgs/development/libraries/SDL2/default.nix | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/pkgs/development/libraries/SDL/default.nix b/pkgs/development/libraries/SDL/default.nix index e10d62bb98d..82051854799 100644 --- a/pkgs/development/libraries/SDL/default.nix +++ b/pkgs/development/libraries/SDL/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, audiofile, libcap +{ stdenv, fetchurl, fetchpatch, pkgconfig, audiofile, libcap, libiconv , openglSupport ? false, mesa_noglu, mesa_glu , alsaSupport ? true, alsaLib , x11Support ? hostPlatform == buildPlatform, libXext, libICE, libXrandr @@ -40,7 +40,8 @@ stdenv.mkDerivation rec { buildInputs = let notMingw = !hostPlatform.isMinGW; 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 # we must arrange to add it to its RPATH; however, `patchelf' seems diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix index d75aea726e1..6b6c9599c28 100644 --- a/pkgs/development/libraries/SDL2/default.nix +++ b/pkgs/development/libraries/SDL2/default.nix @@ -8,6 +8,7 @@ , ibusSupport ? false, ibus , pulseaudioSupport ? true, libpulseaudio , AudioUnit, Cocoa, CoreAudio, CoreServices, ForceFeedback, OpenGL +, libiconv }: # 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. propagatedBuildInputs = lib.optionals x11Support [ libICE libXi libXScrnSaver libXcursor libXinerama libXext libXrandr libXxf86vm ] ++ lib.optionals waylandSupport [ wayland wayland-protocols libxkbcommon ] ++ - lib.optional pulseaudioSupport libpulseaudio; + lib.optional pulseaudioSupport libpulseaudio + ++ [ libiconv ]; buildInputs = [ audiofile ] ++ lib.optional openglSupport mesa_noglu ++ |