diff options
-rw-r--r-- | pkgs/misc/lilypond/default.nix | 28 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 21 insertions, 11 deletions
diff --git a/pkgs/misc/lilypond/default.nix b/pkgs/misc/lilypond/default.nix index b3a9bec29725..65575af4c392 100644 --- a/pkgs/misc/lilypond/default.nix +++ b/pkgs/misc/lilypond/default.nix @@ -1,24 +1,36 @@ { stdenv, fetchurl, ghostscript, texinfo, imagemagick, texi2html, guile -, python, gettext, flex, perl, bison, pkgconfig, texLive -, fontconfig, freetype, pango, fontforge, help2man }: +, python, gettext, flex, perl, bison, pkgconfig, texLive, dblatex +, fontconfig, freetype, pango, fontforge, help2man, zip, netpbm, groff +, fetchsvn }: stdenv.mkDerivation rec{ - majorVersion="2.13"; - minorVersion="46"; + majorVersion="2.14"; + minorVersion="2"; version="${majorVersion}.${minorVersion}"; name = "lilypond-${version}"; + urwfonts = fetchsvn { + url = "http://svn.ghostscript.com/ghostscript/tags/urw-fonts-1.0.7pre44"; + sha256 = "0al5vdsb66db6yzwi0qgs1dnd1i1fb77cigdjxg8zxhhwf6hhwpn"; + }; + src = fetchurl { url = "http://download.linuxaudio.org/lilypond/sources/v${majorVersion}/lilypond-${version}.tar.gz"; - sha256 = "370f59d10a3fc74c5790111f7a69e04304eda5384513c95838dda3cc087904e6"; + # 2.15.42 + # sha256 = "0cm2fq1cr9d24w5xkz6ik6qnby516dfahz4cw47xx8mb5qsa4drd"; + sha256 = "15i6k3fjc29wvchayn31khxhpppzd4g6ivbk7l43fakj8lw6nfi4"; }; - configureFlags = [ "--disable-documentation" "--with-ncsb-dir=${ghostscript}/share/ghostscript/fonts"]; + preConfigure='' + sed -e "s@mem=mf2pt1@mem=$PWD/mf/mf2pt1@" -i scripts/build/mf2pt1.pl + ''; + + configureFlags = [ "--disable-documentation" "--with-ncsb-dir=${urwfonts}"]; buildInputs = - [ ghostscript texinfo imagemagick texi2html guile + [ ghostscript texinfo imagemagick texi2html guile dblatex zip netpbm python gettext flex perl bison pkgconfig texLive fontconfig freetype pango - fontforge help2man + fontforge help2man groff ]; meta = { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c12d033f1ef9..5a4729bfbf6f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8595,9 +8595,7 @@ let lazylist = callPackage ../tools/typesetting/tex/lazylist { }; - lilypond = callPackage ../misc/lilypond { - guile = guile_1_8; - }; + lilypond = callPackage ../misc/lilypond { }; martyr = callPackage ../development/libraries/martyr { }; |