diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2014-11-03 12:11:43 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2014-11-03 12:58:54 +0100 |
| commit | 0ff8281b12954f90a0095ffef0da79e3c5f8351d (patch) | |
| tree | 8ee77ba2b650fd20bc597026a09ad0c3a29a674e /pkgs/applications/video/aegisub | |
| parent | 98cef5ff67fbc7ce330ecd09159a064cdef1a723 (diff) | |
aegisub: do not force libiconv, use auto link flags
This fixes build after #4419.
It seems to start fine without the flags, CC maint. @AndersonTorres.
Diffstat (limited to 'pkgs/applications/video/aegisub')
| -rw-r--r-- | pkgs/applications/video/aegisub/default.nix | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/pkgs/applications/video/aegisub/default.nix b/pkgs/applications/video/aegisub/default.nix index b42e781704a0..746e7afb38d4 100644 --- a/pkgs/applications/video/aegisub/default.nix +++ b/pkgs/applications/video/aegisub/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl -, libX11, gettext, wxGTK -, libiconv, fontconfig, freetype +, libX11, wxGTK +, libiconvOrEmpty, fontconfig, freetype , mesa , libass, fftw, ffms , ffmpeg, pkgconfig, zlib # Undocumented (?) dependencies @@ -29,19 +29,22 @@ stdenv.mkDerivation rec { }; buildInputs = with stdenv.lib; - [ intltool libX11 gettext wxGTK libiconv fontconfig freetype mesa libass fftw ffms ffmpeg pkgconfig zlib icu boost boost.lib ] - ++ optional spellChecking hunspell - ++ optional automationSupport lua - ++ optional openalSupport openal - ++ optional alsaSupport alsaLib - ++ optional pulseaudioSupport pulseaudio - ++ optional portaudioSupport portaudio - ; - - NIX_LDFLAGS = "-liconv -lavutil -lavformat -lavcodec -lswscale -lz -lm -lGL"; + [ pkgconfig intltool libX11 wxGTK fontconfig freetype mesa + libass fftw ffms ffmpeg zlib icu boost boost.lib + ] + ++ libiconvOrEmpty + ++ optional spellChecking hunspell + ++ optional automationSupport lua + ++ optional openalSupport openal + ++ optional alsaSupport alsaLib + ++ optional pulseaudioSupport pulseaudio + ++ optional portaudioSupport portaudio + ; configureFlags = "--with-boost-libdir=${boost.lib}/lib/"; + enableParallelBuilding = true; + postInstall = "ln -s $out/bin/aegisub-* $out/bin/aegisub"; meta = with stdenv.lib; { |