Merge pull request #7224 from AndersonTorres/aegisub

Aegisub: 3.2.1 -> 3.2.2
This commit is contained in:
Pascal Wittmann 2015-04-15 19:39:12 +02:00
commit 74235b70f1
2 changed files with 13 additions and 7 deletions

View File

@ -5,34 +5,35 @@
, libass, fftw, ffms , libass, fftw, ffms
, ffmpeg, pkgconfig, zlib # Undocumented (?) dependencies , ffmpeg, pkgconfig, zlib # Undocumented (?) dependencies
, icu, boost, intltool # New dependencies , icu, boost, intltool # New dependencies
, spellChecking ? true, hunspell ? null , spellcheckSupport ? true, hunspell ? null
, automationSupport ? true, lua ? null , automationSupport ? true, lua ? null
, openalSupport ? false, openal ? null , openalSupport ? false, openal ? null
, alsaSupport ? true, alsaLib ? null , alsaSupport ? true, alsaLib ? null
, pulseaudioSupport ? true, pulseaudio ? null , pulseaudioSupport ? true, pulseaudio ? null
, portaudioSupport ? false, portaudio ? null }: , portaudioSupport ? false, portaudio ? null }:
assert spellChecking -> (hunspell != null); assert spellcheckSupport -> (hunspell != null);
assert automationSupport -> (lua != null); assert automationSupport -> (lua != null);
assert openalSupport -> (openal != null); assert openalSupport -> (openal != null);
assert alsaSupport -> (alsaLib != null); assert alsaSupport -> (alsaLib != null);
assert pulseaudioSupport -> (pulseaudio != null); assert pulseaudioSupport -> (pulseaudio != null);
assert portaudioSupport -> (portaudio != null); assert portaudioSupport -> (portaudio != null);
with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "aegisub-${version}"; name = "aegisub-${version}";
version = "3.2.1"; version = "3.2.2";
src = fetchurl { src = fetchurl {
url = "http://ftp.aegisub.org/pub/releases/${name}.tar.xz"; url = "http://ftp.aegisub.org/pub/releases/${name}.tar.xz";
sha256 = "1p7qdnxyyyrlpvxdrrp15b5967d7bzpjl3vdy0q66g4aabr2h6ln"; sha256 = "11b83qazc8h0iidyj1rprnnjdivj1lpphvpa08y53n42bfa36pn5";
}; };
buildInputs = with stdenv.lib; buildInputs = with stdenv.lib;
[ pkgconfig intltool libX11 wxGTK fontconfig freetype mesa [ pkgconfig intltool libX11 wxGTK fontconfig freetype mesa
libass fftw ffms ffmpeg zlib icu boost boost.lib libiconv libass fftw ffms ffmpeg zlib icu boost boost.lib libiconv
] ]
++ optional spellChecking hunspell ++ optional spellcheckSupport hunspell
++ optional automationSupport lua ++ optional automationSupport lua
++ optional openalSupport openal ++ optional openalSupport openal
++ optional alsaSupport alsaLib ++ optional alsaSupport alsaLib
@ -40,12 +41,11 @@ stdenv.mkDerivation rec {
++ optional portaudioSupport portaudio ++ optional portaudioSupport portaudio
; ;
enableParallelBuilding = true; 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 = {
description = "An advanced subtitle editor"; description = "An advanced subtitle editor";
longDescription = '' longDescription = ''
Aegisub is a free, cross-platform open source tool for creating and Aegisub is a free, cross-platform open source tool for creating and

View File

@ -483,6 +483,12 @@ let
aegisub = callPackage ../applications/video/aegisub { aegisub = callPackage ../applications/video/aegisub {
wxGTK = wxGTK30; wxGTK = wxGTK30;
spellcheckSupport = config.aegisub.spellcheckSupport or true;
automationSupport = config.aegisub.automationSupport or true;
openalSupport = config.aegisub.openalSupport or false;
alsaSupport = config.aegisub.alsaSupport or true;
pulseaudioSupport = config.aegisub.pulseaudioSupport or true;
portaudioSupport = config.aegisub.portaudioSupport or false;
}; };
aespipe = callPackage ../tools/security/aespipe { }; aespipe = callPackage ../tools/security/aespipe { };