diff options
author | Alyssa Ross <hi@alyssa.is> | 2019-06-19 19:22:30 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2019-06-19 19:22:30 +0000 |
commit | 6c3ffdc228a9808c65a0205cd1fd404578d02dee (patch) | |
tree | c5998bfbac1bc92dace314e051164f830976d661 /nixpkgs/pkgs/misc/lilypond | |
parent | ef93931efff0323fd13c4270415b578c73b5ef35 (diff) | |
parent | 83ba5afcc9682b52b39a9a958f730b966cc369c5 (diff) | |
download | nixlib-6c3ffdc228a9808c65a0205cd1fd404578d02dee.tar nixlib-6c3ffdc228a9808c65a0205cd1fd404578d02dee.tar.gz nixlib-6c3ffdc228a9808c65a0205cd1fd404578d02dee.tar.bz2 nixlib-6c3ffdc228a9808c65a0205cd1fd404578d02dee.tar.lz nixlib-6c3ffdc228a9808c65a0205cd1fd404578d02dee.tar.xz nixlib-6c3ffdc228a9808c65a0205cd1fd404578d02dee.tar.zst nixlib-6c3ffdc228a9808c65a0205cd1fd404578d02dee.zip |
Merge commit '83ba5afcc9682b52b39a9a958f730b966cc369c5'
Diffstat (limited to 'nixpkgs/pkgs/misc/lilypond')
-rw-r--r-- | nixpkgs/pkgs/misc/lilypond/unstable.nix | 2 | ||||
-rw-r--r-- | nixpkgs/pkgs/misc/lilypond/with-fonts.nix | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/nixpkgs/pkgs/misc/lilypond/unstable.nix b/nixpkgs/pkgs/misc/lilypond/unstable.nix index ce72c1fdfee8..5b548038da9f 100644 --- a/nixpkgs/pkgs/misc/lilypond/unstable.nix +++ b/nixpkgs/pkgs/misc/lilypond/unstable.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, lilypond, ghostscript, gyre-fonts }: +{ fetchgit, lilypond, ghostscript, gyre-fonts }: let diff --git a/nixpkgs/pkgs/misc/lilypond/with-fonts.nix b/nixpkgs/pkgs/misc/lilypond/with-fonts.nix index 829d2d4e02e4..36dbcf170dd5 100644 --- a/nixpkgs/pkgs/misc/lilypond/with-fonts.nix +++ b/nixpkgs/pkgs/misc/lilypond/with-fonts.nix @@ -1,6 +1,5 @@ { stdenv, lndir, symlinkJoin, makeWrapper , lilypond, openlilylib-fonts -, fonts ? openlilylib-fonts.all }: stdenv.lib.appendToName "with-fonts" (symlinkJoin { |