Skip to content

Commit

Permalink
aegisub: do not force libiconv, use auto link flags
Browse files Browse the repository at this point in the history
This fixes build after #4419.
It seems to start fine without the flags, CC maint. @AndersonTorres.
  • Loading branch information
vcunat committed Nov 3, 2014
1 parent 98cef5f commit 0ff8281
Showing 1 changed file with 15 additions and 12 deletions.
27 changes: 15 additions & 12 deletions pkgs/applications/video/aegisub/default.nix
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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; {
Expand Down

0 comments on commit 0ff8281

Please sign in to comment.