diff options
| author | Eric Seidel <gridaphobe@gmail.com> | 2014-11-26 15:16:50 -0800 |
|---|---|---|
| committer | Eric Seidel <gridaphobe@gmail.com> | 2015-02-07 20:29:28 -0800 |
| commit | e08b9ab8d3d6362c774a786797347fa7483af773 (patch) | |
| tree | f64e5ce1224cb2cb8d5cfa0840bbb86daa68ecc3 /pkgs/applications/video/aegisub | |
| parent | 362d75975045c185e67cb0b66baa43d4d5e337c4 (diff) | |
| download | nixlib-e08b9ab8d3d6362c774a786797347fa7483af773.tar nixlib-e08b9ab8d3d6362c774a786797347fa7483af773.tar.gz nixlib-e08b9ab8d3d6362c774a786797347fa7483af773.tar.bz2 nixlib-e08b9ab8d3d6362c774a786797347fa7483af773.tar.lz nixlib-e08b9ab8d3d6362c774a786797347fa7483af773.tar.xz nixlib-e08b9ab8d3d6362c774a786797347fa7483af773.tar.zst nixlib-e08b9ab8d3d6362c774a786797347fa7483af773.zip | |
kill libiconvOr*
Conflicts: pkgs/applications/networking/mailreaders/sup/default.nix pkgs/development/compilers/ghc/7.8.3-binary.nix pkgs/development/interpreters/php/5.3.nix pkgs/development/interpreters/ruby/patches.nix pkgs/development/libraries/cairo/default.nix pkgs/development/libraries/poppler/default.nix pkgs/top-level/all-packages.nix
Diffstat (limited to 'pkgs/applications/video/aegisub')
| -rw-r--r-- | pkgs/applications/video/aegisub/default.nix | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/pkgs/applications/video/aegisub/default.nix b/pkgs/applications/video/aegisub/default.nix index c32235a592fd..9d54ac99273c 100644 --- a/pkgs/applications/video/aegisub/default.nix +++ b/pkgs/applications/video/aegisub/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl , libX11, wxGTK -, libiconvOrEmpty, fontconfig, freetype +, libiconv, fontconfig, freetype , mesa , libass, fftw, ffms , ffmpeg, pkgconfig, zlib # Undocumented (?) dependencies @@ -30,9 +30,8 @@ stdenv.mkDerivation rec { buildInputs = with stdenv.lib; [ pkgconfig intltool libX11 wxGTK fontconfig freetype mesa - libass fftw ffms ffmpeg zlib icu boost boost.lib + libass fftw ffms ffmpeg zlib icu boost boost.lib libiconv ] - ++ libiconvOrEmpty ++ optional spellChecking hunspell ++ optional automationSupport lua ++ optional openalSupport openal |