diff options
author | Eric Bailey <eric@ericb.me> | 2017-03-06 04:33:31 -0600 |
---|---|---|
committer | Eric Bailey <eric@ericb.me> | 2017-03-06 04:34:08 -0600 |
commit | f497421e148dcb91736cba1771ca5ba18235d299 (patch) | |
tree | a38e27a8729c01fd1e20e13690b147881f87831e /pkgs/misc | |
parent | bdc9589df102bc35ecb8f1c3c00bd47bdc784bec (diff) |
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.
Diffstat (limited to 'pkgs/misc')
-rw-r--r-- | pkgs/misc/lilypond/fonts.nix | 20 | ||||
-rw-r--r-- | 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; |