colin
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #286476 from Silveere/google-fonts-bugfix 

google-fonts: fix font name format
This commit is contained in:
José Romildo Malaquias 2024-03-29 09:51:26 -03:00 committed by GitHub
parent 62bf950eb3 c3933fdc40
commit 159a701902
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/data/fonts/google-fonts/default.nix
View File

@ -40,12 +40,10 @@ stdenvNoCC.mkDerivation {
dontBuild = true;
# The font files are in the fonts directory and use two naming schemes:
# FamilyName-StyleName.ttf and FamilyName[param1,param2,...].ttf
# This installs all fonts if fonts is empty and otherwise only
# the specified fonts by FamilyName. To do this, it invokes
# `find` 2 times for every font, anyone is free to do this
# in a more efficient way.
# The font files are in the fonts directory and use three naming schemes:
# FamilyName-StyleName.ttf, FamilyName[param1,param2,...].ttf, and
# FamilyName.ttf. This installs all fonts if fonts is empty and otherwise
# only the specified fonts by FamilyName.
fonts = map (font: builtins.replaceStrings [" "] [""] font) fonts;
installPhase = ''
adobeBlankDest=$adobeBlank/share/fonts/truetype
@ -56,8 +54,7 @@ stdenvNoCC.mkDerivation {
find . -name '*.ttf' -exec install -m 444 -Dt $dest '{}' +
'' else ''
for font in $fonts; do
find . -name "$font-*.ttf" -exec install -m 444 -Dt $dest '{}' +
find . -name "$font[*.ttf" -exec install -m 444 -Dt $dest '{}' +
find . \( -name "$font-*.ttf" -o -name "$font[*.ttf" -o -name "$font.ttf" \) -exec install -m 444 -Dt $dest '{}' +
done
'');