public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

aegisub: do not force libiconv, use auto link flags

Browse Source 
This fixes build after #4419.
It seems to start fine without the flags, CC maint. @AndersonTorres.
This commit is contained in:
Vladimír Čunát 2014-11-03 12:11:43 +01:00
parent 98cef5ff67
commit 0ff8281b12
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/applications/video/aegisub/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl { stdenv, fetchurl
, libX11, gettext, wxGTK , libX11, wxGTK
, libiconv, fontconfig, freetype , libiconvOrEmpty, fontconfig, freetype
, mesa , mesa
, libass, fftw, ffms , libass, fftw, ffms
, ffmpeg, pkgconfig, zlib # Undocumented (?) dependencies , ffmpeg, pkgconfig, zlib # Undocumented (?) dependencies
@ -29,7 +29,10 @@ stdenv.mkDerivation rec {
}; };
buildInputs = with stdenv.lib; buildInputs = with stdenv.lib;
[ intltool libX11 gettext wxGTK libiconv fontconfig freetype mesa libass fftw ffms ffmpeg pkgconfig zlib icu boost boost.lib ] [ pkgconfig intltool libX11 wxGTK fontconfig freetype mesa
libass fftw ffms ffmpeg zlib icu boost boost.lib
]
++ libiconvOrEmpty
++ optional spellChecking hunspell ++ optional spellChecking hunspell
++ optional automationSupport lua ++ optional automationSupport lua
++ optional openalSupport openal ++ optional openalSupport openal
@ -38,10 +41,10 @@ stdenv.mkDerivation rec {
++ optional portaudioSupport portaudio ++ optional portaudioSupport portaudio
; ;
NIX_LDFLAGS = "-liconv -lavutil -lavformat -lavcodec -lswscale -lz -lm -lGL";
configureFlags = "--with-boost-libdir=${boost.lib}/lib/"; configureFlags = "--with-boost-libdir=${boost.lib}/lib/";
enableParallelBuilding = true;
postInstall = "ln -s $out/bin/aegisub-* $out/bin/aegisub"; postInstall = "ln -s $out/bin/aegisub-* $out/bin/aegisub";
meta = with stdenv.lib; { meta = with stdenv.lib; {