diff options
| author | Orivej Desh <orivej@gmx.fr> | 2020-03-13 23:34:09 +0000 |
|---|---|---|
| committer | Orivej Desh <orivej@gmx.fr> | 2020-03-13 23:34:56 +0000 |
| commit | 2e099c7e53a2f36a5d05bfb8f6b823b164ecff3a (patch) | |
| tree | 7c066474e2463fa8c62b6295adbca27f04e10016 /pkgs/misc | |
| parent | 33746be61fb5b587fdecbb5a95b37667844a2d15 (diff) | |
| download | nixpkgs-2e099c7e53a2f36a5d05bfb8f6b823b164ecff3a.tar nixpkgs-2e099c7e53a2f36a5d05bfb8f6b823b164ecff3a.tar.gz nixpkgs-2e099c7e53a2f36a5d05bfb8f6b823b164ecff3a.tar.bz2 nixpkgs-2e099c7e53a2f36a5d05bfb8f6b823b164ecff3a.tar.lz nixpkgs-2e099c7e53a2f36a5d05bfb8f6b823b164ecff3a.tar.xz nixpkgs-2e099c7e53a2f36a5d05bfb8f6b823b164ecff3a.tar.zst nixpkgs-2e099c7e53a2f36a5d05bfb8f6b823b164ecff3a.zip | |
lilypond: 2.18.2 -> 2.20.0
Diffstat (limited to 'pkgs/misc')
| -rw-r--r-- | pkgs/misc/lilypond/default.nix | 37 | ||||
| -rw-r--r-- | pkgs/misc/lilypond/unstable.nix | 6 |
2 files changed, 16 insertions, 27 deletions
diff --git a/pkgs/misc/lilypond/default.nix b/pkgs/misc/lilypond/default.nix index a740323b47f..9e76693ce8f 100644 --- a/pkgs/misc/lilypond/default.nix +++ b/pkgs/misc/lilypond/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, ghostscript, texinfo, imagemagick, texi2html, guile +{ stdenv, lib, fetchurl, ghostscript, gyre-fonts, texinfo, imagemagick, texi2html, guile , python2, gettext, flex, perl, bison, pkgconfig, autoreconfHook, dblatex , fontconfig, freetype, pango, fontforge, help2man, zip, netpbm, groff , makeWrapper, t1utils @@ -7,22 +7,17 @@ } }: -let - - version = "2.18.2"; - -in - -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "lilypond"; - inherit version; + version = "2.20.0"; - src = fetchgit { - url = "https://git.savannah.gnu.org/r/lilypond.git"; - rev = "release/${version}-1"; - sha256 = "0fk045fmmb6fcv7jdvkbqr04qlwnxzwclr2gzx3gja714xy6a76x"; + src = fetchurl { + url = "http://lilypond.org/download/sources/v${lib.versions.majorMinor version}/lilypond-${version}.tar.gz"; + sha256 = "0qd6pd4siss016ffmcyw5qc6pr2wihnvrgd4kh1x725w7wr02nar"; }; + patches = [ ./findlib.patch ]; + postInstall = '' for f in "$out/bin/"*; do # Override default argv[0] setting so LilyPond can find @@ -35,7 +30,9 @@ stdenv.mkDerivation { configureFlags = [ "--disable-documentation" - "--with-ncsb-dir=${ghostscript}/share/ghostscript/fonts" + # FIXME: these URW fonts are not OTF, configure reports "URW++ OTF files... no". + "--with-urwotf-dir=${ghostscript}/share/ghostscript/fonts" + "--with-texgyre-dir=${gyre-fonts}/share/fonts/truetype/" ]; preConfigure = '' @@ -43,25 +40,23 @@ stdenv.mkDerivation { export HOME=$TMPDIR/home ''; - nativeBuildInputs = [ makeWrapper pkgconfig autoreconfHook ]; - - autoreconfPhase = "NOCONFIGURE=1 sh autogen.sh"; + nativeBuildInputs = [ autoreconfHook bison flex makeWrapper pkgconfig ]; buildInputs = [ ghostscript texinfo imagemagick texi2html guile dblatex tex zip netpbm - python2 gettext flex perl bison fontconfig freetype pango + python2 gettext perl fontconfig freetype pango fontforge help2man groff t1utils ]; + autoreconfPhase = "NOCONFIGURE=1 sh autogen.sh"; + enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Music typesetting system"; homepage = "http://lilypond.org/"; license = licenses.gpl3; maintainers = with maintainers; [ marcweber yurrriq ]; platforms = platforms.all; }; - - patches = [ ./findlib.patch ]; } diff --git a/pkgs/misc/lilypond/unstable.nix b/pkgs/misc/lilypond/unstable.nix index e2c0dccb2e1..68f48a2db64 100644 --- a/pkgs/misc/lilypond/unstable.nix +++ b/pkgs/misc/lilypond/unstable.nix @@ -18,10 +18,4 @@ lilypond.overrideAttrs (oldAttrs: { meta = oldAttrs.meta // { broken = stdenv.isDarwin; }; - - configureFlags = [ - "--disable-documentation" - "--with-urwotf-dir=${ghostscript}/share/ghostscript/fonts" - "--with-texgyre-dir=${gyre-fonts}/share/fonts/truetype/" - ]; }) |