alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Aegisub: update to 3.1.3 (close #2550)

Browse source 
New dependencies: icu, intltool, boost (default = 1.55), wxGTK 3.0
Fixes a bug on Boost detection
@vcunat: minor refactoring.
This commit is contained in:
AndersonTorres 2014-05-05 22:56:41 -03:00 committed by Vladimír Čunát
parent b56e41aebe
commit 64948222ba
2 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
pkgs/applications/video/aegisub/default.nix
View file

@ -4,6 +4,7 @@
, mesa , mesa
, libass, fftw, ffms , libass, fftw, ffms
, ffmpeg, pkgconfig, zlib # Undocumented (?) dependencies , ffmpeg, pkgconfig, zlib # Undocumented (?) dependencies
, icu, boost, intltool # New dependencies
, spellChecking ? true, hunspell ? null , spellChecking ? true, hunspell ? null
, automationSupport ? true, lua ? null , automationSupport ? true, lua ? null
, openalSupport ? false, openal ? null , openalSupport ? false, openal ? null
@ -28,8 +29,10 @@ stdenv.mkDerivation rec {
sha256 = "0n2y5cggayr8246p2cvrz0ajlhhvmzcgsp7nljnm21jypk15pspg"; sha256 = "0n2y5cggayr8246p2cvrz0ajlhhvmzcgsp7nljnm21jypk15pspg";
}; };
nativeBuildInputs = [ intltool ];
buildInputs = with stdenv.lib; buildInputs = with stdenv.lib;
[ libX11 gettext wxGTK libiconv fontconfig freetype mesa libass fftw ffms ffmpeg pkgconfig zlib ] [ libX11 gettext wxGTK libiconv fontconfig freetype mesa libass fftw ffms ffmpeg pkgconfig zlib icu boost ]
++ optional spellChecking hunspell ++ optional spellChecking hunspell
++ optional automationSupport lua ++ optional automationSupport lua
++ optional openalSupport openal ++ optional openalSupport openal
@ -38,13 +41,13 @@ stdenv.mkDerivation rec {
++ optional portaudioSupport portaudio ++ optional portaudioSupport portaudio
; ;
NIX_LDFLAGS = "-liconv -lavutil -lavformat -lavcodec -lswscale -lz -lm"; NIX_LDFLAGS = "-liconv -lavutil -lavformat -lavcodec -lswscale -lz -lm -lGL";
preConfigure = "cd aegisub"; configureFlags = "--with-boost-libdir=${boost}/lib/";
postInstall = "ln -s $out/bin/aegisub-3.0 $out/bin/aegisub"; postInstall = "ln -s $out/bin/aegisub-* $out/bin/aegisub";
meta = { meta = with stdenv.lib; {
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
@ -53,12 +56,12 @@ stdenv.mkDerivation rec {
built-in real-time video preview. built-in real-time video preview.
''; '';
homepage = http://www.aegisub.org/; homepage = http://www.aegisub.org/;
license = stdenv.lib.licenses.bsd3; license = licenses.bsd3;
# The Aegisub sources are itself BSD/ISC, # The Aegisub sources are itself BSD/ISC,
# but they are linked against GPL'd softwares # but they are linked against GPL'd softwares
# - so the resulting program will be GPL # - so the resulting program will be GPL
maintainers = [ stdenv.lib.maintainers.AndersonTorres ]; maintainers = [ maintainers.AndersonTorres ];
platforms = stdenv.lib.platforms.linux; platforms = platforms.linux;
}; };
} }

2
pkgs/top-level/all-packages.nix
View file

@ -426,7 +426,7 @@ let
aefs = callPackage ../tools/filesystems/aefs { }; aefs = callPackage ../tools/filesystems/aefs { };
aegisub = callPackage ../applications/video/aegisub { aegisub = callPackage ../applications/video/aegisub {
wxGTK = wxGTK29; wxGTK = wxGTK30;
lua = lua5_1; lua = lua5_1;
}; };