Merge pull request #101724 from pickfire/patch-3

fontdir: add ttc to font regex
2020-10-30 08:41:34 +01:00 · 2020-10-30 08:41:34 +01:00 · 1102a46ffe
commit 1102a46ffe
parent 95cddb4347 f6136d06ff
1 changed files with 1 additions and 1 deletions
--- a/nixos/modules/config/fonts/fontdir.nix
+++ b/nixos/modules/config/fonts/fontdir.nix
@ -8,7 +8,7 @@ let

  x11Fonts = pkgs.runCommand "X11-fonts" { preferLocalBuild = true; } ''
    mkdir -p "$out/share/X11/fonts"
-    font_regexp='.*\.\(ttf\|otf\|pcf\|pfa\|pfb\|bdf\)\(\.gz\)?'
+    font_regexp='.*\.\(ttf\|ttc\|otf\|pcf\|pfa\|pfb\|bdf\)\(\.gz\)?'
    find ${toString config.fonts.fonts} -regex "$font_regexp" \
      -exec ln -sf -t "$out/share/X11/fonts" '{}' \;
    cd "$out/share/X11/fonts"