diff options
| author | Eric Bailey <eric@ericb.me> | 2019-06-10 03:08:09 -0500 |
|---|---|---|
| committer | Eric Bailey <eric@ericb.me> | 2019-06-10 12:30:22 -0500 |
| commit | 79478b8369469ecdb0649d799e5acd994d584a1b (patch) | |
| tree | fc37df99a7173383e4afba66824543d7ad80417e /pkgs/misc/lilypond | |
| parent | 80b51d983ae77f47910ba26305023efbfdb62e91 (diff) | |
| download | nixpkgs-79478b8369469ecdb0649d799e5acd994d584a1b.tar nixpkgs-79478b8369469ecdb0649d799e5acd994d584a1b.tar.gz nixpkgs-79478b8369469ecdb0649d799e5acd994d584a1b.tar.bz2 nixpkgs-79478b8369469ecdb0649d799e5acd994d584a1b.tar.lz nixpkgs-79478b8369469ecdb0649d799e5acd994d584a1b.tar.xz nixpkgs-79478b8369469ecdb0649d799e5acd994d584a1b.tar.zst nixpkgs-79478b8369469ecdb0649d799e5acd994d584a1b.zip | |
lilypond: rework
- fetchurl -> fetchgit - urwfonts -> ghostscript/share/fonts - Add me as maintainer
Diffstat (limited to 'pkgs/misc/lilypond')
| -rw-r--r-- | pkgs/misc/lilypond/default.nix | 35 |
1 files changed, 19 insertions, 16 deletions
diff --git a/pkgs/misc/lilypond/default.nix b/pkgs/misc/lilypond/default.nix index fb17e5e5a2d..e9f8d6984af 100644 --- a/pkgs/misc/lilypond/default.nix +++ b/pkgs/misc/lilypond/default.nix @@ -1,26 +1,26 @@ -{ stdenv, fetchurl, ghostscript, texinfo, imagemagick, texi2html, guile +{ stdenv, fetchgit, ghostscript, texinfo, imagemagick, texi2html, guile , python2, gettext, flex, perl, bison, pkgconfig, autoreconfHook, dblatex , fontconfig, freetype, pango, fontforge, help2man, zip, netpbm, groff -, fetchsvn, makeWrapper, t1utils +, makeWrapper, t1utils , texlive, tex ? texlive.combine { inherit (texlive) scheme-small lh metafont epsf; } }: -stdenv.mkDerivation rec{ - majorVersion="2.18"; - minorVersion="2"; - version="${majorVersion}.${minorVersion}"; - name = "lilypond-${version}"; +let - urwfonts = fetchsvn { - url = "http://svn.ghostscript.com/ghostscript/tags/urw-fonts-1.0.7pre44"; - sha256 = "0al5vdsb66db6yzwi0qgs1dnd1i1fb77cigdjxg8zxhhwf6hhwpn"; - }; + version = "2.18.2"; + +in + +stdenv.mkDerivation { + pname = "lilypond"; + inherit version; - src = fetchurl { - url = "http://download.linuxaudio.org/lilypond/sources/v${majorVersion}/lilypond-${version}.tar.gz"; - sha256 = "01xs9x2wjj7w9appaaqdhk15r1xvvdbz9qwahzhppfmhclvp779j"; + src = fetchgit { + url = "https://git.savannah.gnu.org/r/lilypond.git"; + rev = "release/${version}-1"; + sha256 = "0fk045fmmb6fcv7jdvkbqr04qlwnxzwclr2gzx3gja714xy6a76x"; }; postInstall = '' @@ -33,7 +33,10 @@ stdenv.mkDerivation rec{ done ''; - configureFlags = [ "--disable-documentation" "--with-ncsb-dir=${urwfonts}"]; + 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 @@ -56,7 +59,7 @@ stdenv.mkDerivation rec{ description = "Music typesetting system"; homepage = http://lilypond.org/; license = licenses.gpl3; - maintainers = [ maintainers.marcweber ]; + maintainers = with maintainers; [ marcweber yurrriq ]; platforms = platforms.all; }; |