diff options
author | José Romildo Malaquias <malaquias@gmail.com> | 2024-03-29 09:51:26 -0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-03-29 09:51:26 -0300 |
commit | 159a7019025674bcb25194ad95df394d96ae4112 (patch) | |
tree | adc9bece6b4ec1573b9919e8db7489a8a02f5f54 /pkgs/data | |
parent | 62bf950eb3fb4b8bc86a747a576c2338e2cbce41 (diff) | |
parent | c3933fdc40adb18d2e494bfd06435a054893e2f8 (diff) |
Merge pull request #286476 from Silveere/google-fonts-bugfix
google-fonts: fix font name format
Diffstat (limited to 'pkgs/data')
-rw-r--r-- | pkgs/data/fonts/google-fonts/default.nix | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/pkgs/data/fonts/google-fonts/default.nix b/pkgs/data/fonts/google-fonts/default.nix index d0f055166805e..bb3fc3ab0c1db 100644 --- a/pkgs/data/fonts/google-fonts/default.nix +++ b/pkgs/data/fonts/google-fonts/default.nix @@ -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 ''); |