about summary refs log tree commit diff
path: root/pkgs/misc/lilypond/unstable.nix
diff options
context:
space:
mode:
authorVincent Laporte <Vincent.Laporte@gmail.com>2017-08-28 19:55:42 +0000
committerVincent Laporte <Vincent.Laporte@gmail.com>2017-08-28 19:55:42 +0000
commit1cae15edda33f59bd17e0bd71bd4837f98c1b61b (patch)
treee1f5323aab01c20edc864b8b243da7399308526c /pkgs/misc/lilypond/unstable.nix
parent39cf16f10e744f748059d00f506b764f2d78e4c7 (diff)
downloadnixlib-1cae15edda33f59bd17e0bd71bd4837f98c1b61b.tar
nixlib-1cae15edda33f59bd17e0bd71bd4837f98c1b61b.tar.gz
nixlib-1cae15edda33f59bd17e0bd71bd4837f98c1b61b.tar.bz2
nixlib-1cae15edda33f59bd17e0bd71bd4837f98c1b61b.tar.lz
nixlib-1cae15edda33f59bd17e0bd71bd4837f98c1b61b.tar.xz
nixlib-1cae15edda33f59bd17e0bd71bd4837f98c1b61b.tar.zst
nixlib-1cae15edda33f59bd17e0bd71bd4837f98c1b61b.zip
lilypond-unstable: 2.19.24 -> 2.19.65
Diffstat (limited to 'pkgs/misc/lilypond/unstable.nix')
-rw-r--r--pkgs/misc/lilypond/unstable.nix14
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 ];