From f497421e148dcb91736cba1771ca5ba18235d299 Mon Sep 17 00:00:00 2001
From: Eric Bailey <eric@ericb.me>
Date: Mon, 6 Mar 2017 04:33:31 -0600
Subject: [PATCH] lilypond-with-fonts: use all fonts by default

Add a list of all fonts to openlilylib-fonts and use that as the default
fonts argument to lilypond-with-fonts.
---
 pkgs/misc/lilypond/fonts.nix      | 20 +++++++++++++++++++-
 pkgs/misc/lilypond/with-fonts.nix |  9 ++++++++-
 2 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/lilypond/fonts.nix b/pkgs/misc/lilypond/fonts.nix
index fd96c8adc325..6ad4f06328d8 100644
--- a/pkgs/misc/lilypond/fonts.nix
+++ b/pkgs/misc/lilypond/fonts.nix
@@ -43,7 +43,7 @@ let
 
 in
 
-{
+rec {
   beethoven = olpFont {
     fontName = "beethoven";
     rev = "669f400";
@@ -119,4 +119,22 @@ in
     rev = "44bf262";
     sha256 = "09i8p3p4z6vz69j187cpxvikkgc4pk6gxippahy0k7i7bh0d4qaj";
   };
+
+  all = [
+    beethoven
+    bravura
+    cadence
+    gonville
+    gutenberg1939
+    haydn
+    improviso
+    lilyboulez
+    lilyjazz
+    lv-goldenage
+    paganini
+    profondo
+    ross
+    scorlatti
+    sebastiano
+  ];
 }
diff --git a/pkgs/misc/lilypond/with-fonts.nix b/pkgs/misc/lilypond/with-fonts.nix
index 9165fb1ed30d..861d8cf14de9 100644
--- a/pkgs/misc/lilypond/with-fonts.nix
+++ b/pkgs/misc/lilypond/with-fonts.nix
@@ -1,4 +1,11 @@
-{ stdenv, lilypond, lndir }: fonts: stdenv.mkDerivation {
+{ stdenv
+, lndir
+, lilypond
+, openlilylib-fonts
+, fonts ? openlilylib-fonts.all
+}:
+
+stdenv.mkDerivation {
   name = "${lilypond.name}-with-fonts";
   phases = "installPhase";
   buildInputs = fonts;