diff options
| author | Michele Guerini Rocco <rnhmjoj@users.noreply.github.com> | 2020-10-30 08:41:34 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-30 08:41:34 +0100 |
| commit | 1102a46ffee6cc82ba86e3ffcc3c71078d7cb71e (patch) | |
| tree | 1561be1cfc2b5b3506ea9530394c3015ddb8a906 /nixos | |
| parent | 95cddb43476e54925a372e26d6978915a44c784e (diff) | |
| parent | f6136d06ffed9e21879ddd7bd156275de011c447 (diff) | |
| download | nixpkgs-1102a46ffee6cc82ba86e3ffcc3c71078d7cb71e.tar nixpkgs-1102a46ffee6cc82ba86e3ffcc3c71078d7cb71e.tar.gz nixpkgs-1102a46ffee6cc82ba86e3ffcc3c71078d7cb71e.tar.bz2 nixpkgs-1102a46ffee6cc82ba86e3ffcc3c71078d7cb71e.tar.lz nixpkgs-1102a46ffee6cc82ba86e3ffcc3c71078d7cb71e.tar.xz nixpkgs-1102a46ffee6cc82ba86e3ffcc3c71078d7cb71e.tar.zst nixpkgs-1102a46ffee6cc82ba86e3ffcc3c71078d7cb71e.zip | |
Merge pull request #101724 from pickfire/patch-3
fontdir: add ttc to font regex
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/config/fonts/fontdir.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/config/fonts/fontdir.nix b/nixos/modules/config/fonts/fontdir.nix index 264d73ebafa..c4bd3a077d3 100644 --- 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" |