diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2017-08-28 23:08:56 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-28 23:08:56 +0200 |
| commit | 9206a15985dcbebd4debe4a3d0278fb7df06ac31 (patch) | |
| tree | b617434712cde894c9eca33e2bca1b7bb9c9ad73 | |
| parent | a2fae4a5c5bc6d224cb9c73b5d84f074ff56d692 (diff) | |
| parent | 1cae15edda33f59bd17e0bd71bd4837f98c1b61b (diff) | |
| download | nixlib-9206a15985dcbebd4debe4a3d0278fb7df06ac31.tar nixlib-9206a15985dcbebd4debe4a3d0278fb7df06ac31.tar.gz nixlib-9206a15985dcbebd4debe4a3d0278fb7df06ac31.tar.bz2 nixlib-9206a15985dcbebd4debe4a3d0278fb7df06ac31.tar.lz nixlib-9206a15985dcbebd4debe4a3d0278fb7df06ac31.tar.xz nixlib-9206a15985dcbebd4debe4a3d0278fb7df06ac31.tar.zst nixlib-9206a15985dcbebd4debe4a3d0278fb7df06ac31.zip | |
Merge pull request #28649 from vbgl/lilypond-unstable-2.19.65
lilypond-unstable: 2.19.24 -> 2.19.65
| -rw-r--r-- | pkgs/misc/lilypond/unstable.nix | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/pkgs/misc/lilypond/unstable.nix b/pkgs/misc/lilypond/unstable.nix index d16102df9278..046416cd9df2 100644 --- a/pkgs/misc/lilypond/unstable.nix +++ b/pkgs/misc/lilypond/unstable.nix @@ -1,19 +1,25 @@ -{ stdenv, fetchurl, guile, rsync, lilypond }: +{ stdenv, fetchurl, fetchgit, guile, rsync, lilypond, gyre-fonts }: with stdenv.lib; +let urw-fonts = fetchgit { + url = "http://git.ghostscript.com/urw-core35-fonts.git"; + rev = "1f28a6fcd2176256a995db907d9ffe6e1b9b83e9"; + sha256 = "1nlx95l1pw5lxqp2v0rn9a7lqrsbbhzr0dy3cybk55r4a8awbr2a"; +}; in + overrideDerivation lilypond (p: rec { majorVersion = "2.19"; - minorVersion = "24"; + minorVersion = "65"; version="${majorVersion}.${minorVersion}"; name = "lilypond-${version}"; src = fetchurl { url = "http://download.linuxaudio.org/lilypond/sources/v${majorVersion}/lilypond-${version}.tar.gz"; - sha256 = "0wd57swrfc2nvkj10ipdbhq6gpnckiafg2b2kpd8aydsyp248iln"; + sha256 = "0k2jy7z58j62c5cv1308ac62d6jri17wip76xrbq8s6jq6jl7phd"; }; - configureFlags = [ "--disable-documentation" "--with-fonts-dir=${p.urwfonts}"]; + configureFlags = [ "--disable-documentation" "--with-urwotf-dir=${urw-fonts}" "--with-texgyre-dir=${gyre-fonts}/share/fonts/truetype/"]; buildInputs = p.buildInputs ++ [ rsync ]; |