pyrox.dev / nixpkgs
lol
fork atom

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.

Vladimír Čunát 0ff8281b 98cef5ff

+15 -12
+15 -12
pkgs/applications/video/aegisub/default.nix
··· 1 1 { stdenv, fetchurl 2 - , libX11, gettext, wxGTK 3 - , libiconv, fontconfig, freetype 2 + , libX11, wxGTK 3 + , libiconvOrEmpty, fontconfig, freetype 4 4 , mesa 5 5 , libass, fftw, ffms 6 6 , ffmpeg, pkgconfig, zlib # Undocumented (?) dependencies ··· 29 29 }; 30 30 31 31 buildInputs = with stdenv.lib; 32 - [ intltool libX11 gettext wxGTK libiconv fontconfig freetype mesa libass fftw ffms ffmpeg pkgconfig zlib icu boost boost.lib ] 33 - ++ optional spellChecking hunspell 34 - ++ optional automationSupport lua 35 - ++ optional openalSupport openal 36 - ++ optional alsaSupport alsaLib 37 - ++ optional pulseaudioSupport pulseaudio 38 - ++ optional portaudioSupport portaudio 39 - ; 32 + [ pkgconfig intltool libX11 wxGTK fontconfig freetype mesa 33 + libass fftw ffms ffmpeg zlib icu boost boost.lib 34 + ] 35 + ++ libiconvOrEmpty 36 + ++ optional spellChecking hunspell 37 + ++ optional automationSupport lua 38 + ++ optional openalSupport openal 39 + ++ optional alsaSupport alsaLib 40 + ++ optional pulseaudioSupport pulseaudio 41 + ++ optional portaudioSupport portaudio 42 + ; 40 43 41 - NIX_LDFLAGS = "-liconv -lavutil -lavformat -lavcodec -lswscale -lz -lm -lGL"; 44 + configureFlags = "--with-boost-libdir=${boost.lib}/lib/"; 42 45 43 - configureFlags = "--with-boost-libdir=${boost.lib}/lib/"; 46 + enableParallelBuilding = true; 44 47 45 48 postInstall = "ln -s $out/bin/aegisub-* $out/bin/aegisub"; 46 49