diff --git a/pkgs/misc/lilypond/unstable.nix b/pkgs/misc/lilypond/unstable.nix index df83502aa88..ce72c1fdfee 100644 --- a/pkgs/misc/lilypond/unstable.nix +++ b/pkgs/misc/lilypond/unstable.nix @@ -1,26 +1,23 @@ -{ stdenv, fetchurl, fetchgit, rsync, lilypond, gyre-fonts }: +{ stdenv, fetchgit, lilypond, ghostscript, gyre-fonts }: -with stdenv.lib; +let -let urw-fonts = fetchgit { - url = "http://git.ghostscript.com/urw-core35-fonts.git"; - rev = "1f28a6fcd2176256a995db907d9ffe6e1b9b83e9"; - sha256 = "1nlx95l1pw5lxqp2v0rn9a7lqrsbbhzr0dy3cybk55r4a8awbr2a"; -}; in + version = "2.19.83"; -overrideDerivation lilypond (p: rec { - majorVersion = "2.19"; - minorVersion = "65"; - version="${majorVersion}.${minorVersion}"; - name = "lilypond-${version}"; +in - src = fetchurl { - url = "http://download.linuxaudio.org/lilypond/sources/v${majorVersion}/lilypond-${version}.tar.gz"; - sha256 = "0k2jy7z58j62c5cv1308ac62d6jri17wip76xrbq8s6jq6jl7phd"; +lilypond.overrideAttrs (oldAttrs: { + inherit version; + + src = fetchgit { + url = "https://git.savannah.gnu.org/r/lilypond.git"; + rev = "release/${version}-1"; + sha256 = "1ycyx9x76d79jh7wlwyyhdjkyrwnhzqpw006xn2fk35s0jrm2iz0"; }; - configureFlags = [ "--disable-documentation" "--with-urwotf-dir=${urw-fonts}" "--with-texgyre-dir=${gyre-fonts}/share/fonts/truetype/"]; - - buildInputs = p.buildInputs ++ [ rsync ]; - + configureFlags = [ + "--disable-documentation" + "--with-urwotf-dir=${ghostscript}/share/ghostscript/fonts" + "--with-texgyre-dir=${gyre-fonts}/share/fonts/truetype/" + ]; })