diff options
| author | Shea Levy <shea@shealevy.com> | 2015-02-17 13:52:37 -0500 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2015-02-17 13:52:37 -0500 |
| commit | 2f061ff16b3c54ce8c85bef4f873c1548be9b1c3 (patch) | |
| tree | 728d5e8d790ececee0c464099dd5eaa69b19ebdf /pkgs/applications/video | |
| parent | 6be3ffb0d4d1c8f35c89c9525a7e6e11995637c7 (diff) | |
| parent | ef6b18c0ecc4f484e0ee31144527be7ff6c42697 (diff) | |
| download | nixpkgs-2f061ff16b3c54ce8c85bef4f873c1548be9b1c3.tar nixpkgs-2f061ff16b3c54ce8c85bef4f873c1548be9b1c3.tar.gz nixpkgs-2f061ff16b3c54ce8c85bef4f873c1548be9b1c3.tar.bz2 nixpkgs-2f061ff16b3c54ce8c85bef4f873c1548be9b1c3.tar.lz nixpkgs-2f061ff16b3c54ce8c85bef4f873c1548be9b1c3.tar.xz nixpkgs-2f061ff16b3c54ce8c85bef4f873c1548be9b1c3.tar.zst nixpkgs-2f061ff16b3c54ce8c85bef4f873c1548be9b1c3.zip | |
Merge remote-tracking branch 'origin/staging'
Darwin and haskell fixes.
Diffstat (limited to 'pkgs/applications/video')
| -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 c32235a592f..9d54ac99273 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 |