diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2015-09-23 21:07:12 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2015-09-23 21:14:16 +0200 |
| commit | 77084d30561d746e16a8716125b7b4d6dba3544a (patch) | |
| tree | 554bcbab8ec782f9ecfed0bc7329dfcc33d7e315 /pkgs/misc/lilypond | |
| parent | 9bd0bac3111bc89e8b21bb80c0ca8d26fd601ab3 (diff) | |
lilypond: fix with new dblatex+texlive, fix meta
Also enableParallelBuilding, as it took quite some time to build.
/cc maintainer @MarcWeber.
Diffstat (limited to 'pkgs/misc/lilypond')
| -rw-r--r-- | pkgs/misc/lilypond/default.nix | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/pkgs/misc/lilypond/default.nix b/pkgs/misc/lilypond/default.nix index 3dd3f4378def..29bb9d7d6800 100644 --- a/pkgs/misc/lilypond/default.nix +++ b/pkgs/misc/lilypond/default.nix @@ -1,7 +1,10 @@ { 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 , fetchsvn, makeWrapper, t1utils +, texlive, tex ? texlive.combine { + inherit (texlive) scheme-small lh metafont epsf; + } }: stdenv.mkDerivation rec{ @@ -34,17 +37,19 @@ stdenv.mkDerivation rec{ configureFlags = [ "--disable-documentation" "--with-ncsb-dir=${urwfonts}"]; buildInputs = - [ ghostscript texinfo imagemagick texi2html guile dblatex zip netpbm - python gettext flex perl bison pkgconfig texLive fontconfig freetype pango + [ ghostscript texinfo imagemagick texi2html guile dblatex tex zip netpbm + python gettext flex perl bison pkgconfig fontconfig freetype pango fontforge help2man groff makeWrapper t1utils ]; - meta = { + enableParallelBuilding = true; + + meta = with stdenv.lib; { description = "Music typesetting system"; homepage = http://lilypond.org/; - license = "GPL"; - maintainers = [ stdenv.lib.maintainers.marcweber ]; - platforms = stdenv.lib.platforms.linux; + license = licenses.gpl3; + maintainers = [ maintainers.marcweber ]; + platforms = platforms.linux; }; patches = [ ./findlib.patch ]; |