lilypond: fix with new dblatex+texlive, fix meta

Also enableParallelBuilding, as it took quite some time to build.
/cc maintainer @MarcWeber.
This commit is contained in:
Vladimír Čunát 2015-09-23 21:07:12 +02:00
parent 9bd0bac311
commit 77084d3056
1 changed files with 12 additions and 7 deletions

View File

@ -1,7 +1,10 @@
{ stdenv, fetchurl, ghostscript, texinfo, imagemagick, texi2html, guile { stdenv, fetchurl, ghostscript, texinfo, imagemagick, texi2html, guile
, python, gettext, flex, perl, bison, pkgconfig, texLive, dblatex , python, gettext, flex, perl, bison, pkgconfig, dblatex
, fontconfig, freetype, pango, fontforge, help2man, zip, netpbm, groff , fontconfig, freetype, pango, fontforge, help2man, zip, netpbm, groff
, fetchsvn, makeWrapper, t1utils , fetchsvn, makeWrapper, t1utils
, texlive, tex ? texlive.combine {
inherit (texlive) scheme-small lh metafont epsf;
}
}: }:
stdenv.mkDerivation rec{ stdenv.mkDerivation rec{
@ -34,17 +37,19 @@ stdenv.mkDerivation rec{
configureFlags = [ "--disable-documentation" "--with-ncsb-dir=${urwfonts}"]; configureFlags = [ "--disable-documentation" "--with-ncsb-dir=${urwfonts}"];
buildInputs = buildInputs =
[ ghostscript texinfo imagemagick texi2html guile dblatex zip netpbm [ ghostscript texinfo imagemagick texi2html guile dblatex tex zip netpbm
python gettext flex perl bison pkgconfig texLive fontconfig freetype pango python gettext flex perl bison pkgconfig fontconfig freetype pango
fontforge help2man groff makeWrapper t1utils fontforge help2man groff makeWrapper t1utils
]; ];
meta = { enableParallelBuilding = true;
meta = with stdenv.lib; {
description = "Music typesetting system"; description = "Music typesetting system";
homepage = http://lilypond.org/; homepage = http://lilypond.org/;
license = "GPL"; license = licenses.gpl3;
maintainers = [ stdenv.lib.maintainers.marcweber ]; maintainers = [ maintainers.marcweber ];
platforms = stdenv.lib.platforms.linux; platforms = platforms.linux;
}; };
patches = [ ./findlib.patch ]; patches = [ ./findlib.patch ];