From dba7b7f4bfe2c7d7e379293f33c0c7978b836e4a Mon Sep 17 00:00:00 2001 From: arthsmn Date: Mon, 18 Dec 2023 20:45:48 -0300 Subject: [PATCH 1/3] lilypond-with-fonts: fix build of some fonts --- pkgs/misc/lilypond/fonts.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/misc/lilypond/fonts.nix b/pkgs/misc/lilypond/fonts.nix index f1c80ad761b2..d87e06235717 100644 --- a/pkgs/misc/lilypond/fonts.nix +++ b/pkgs/misc/lilypond/fonts.nix @@ -17,7 +17,11 @@ let local fontsdir="$out/share/lilypond/${lilypond.version}/fonts" install -m755 -d "$fontsdir/otf" - for font in {otf,supplementary-fonts}/**.{o,t}tf; do + + shopt -s globstar + + for font in {otf,supplementary-fonts,supplementary-files}/**/*.{o,t}tf; do + echo $font install -Dt "$fontsdir/otf" -m755 "$font" done From 213eabf52c5d9db2fe759ca96bdedb7a322d9930 Mon Sep 17 00:00:00 2001 From: arthsmn Date: Mon, 18 Dec 2023 20:49:38 -0300 Subject: [PATCH 2/3] lilypond-with-fonts: fix font's permissions --- pkgs/misc/lilypond/fonts.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/lilypond/fonts.nix b/pkgs/misc/lilypond/fonts.nix index d87e06235717..a23f7125f385 100644 --- a/pkgs/misc/lilypond/fonts.nix +++ b/pkgs/misc/lilypond/fonts.nix @@ -22,12 +22,12 @@ let for font in {otf,supplementary-fonts,supplementary-files}/**/*.{o,t}tf; do echo $font - install -Dt "$fontsdir/otf" -m755 "$font" + install -Dt "$fontsdir/otf" -m644 "$font" done install -m755 -d "$fontsdir/svg" for font in svg/**.{svg,woff}; do - install -Dt "$fontsdir/svg" -m755 "$font" + install -Dt "$fontsdir/svg" -m644 "$font" done ''; From d3ee01357620a3b0d7eec68a2622ccbcfda8869f Mon Sep 17 00:00:00 2001 From: arthsmn Date: Mon, 18 Dec 2023 21:13:52 -0300 Subject: [PATCH 3/3] lilypod-with-fonts: add missing fonts' directory --- pkgs/misc/lilypond/fonts.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/misc/lilypond/fonts.nix b/pkgs/misc/lilypond/fonts.nix index a23f7125f385..b624498f0920 100644 --- a/pkgs/misc/lilypond/fonts.nix +++ b/pkgs/misc/lilypond/fonts.nix @@ -26,7 +26,7 @@ let done install -m755 -d "$fontsdir/svg" - for font in svg/**.{svg,woff}; do + for font in {svg,woff}/**.{svg,woff}; do install -Dt "$fontsdir/svg" -m644 "$font" done '';