From a5c0ba40048734cd091d53454f30d853ed1fb3ca Mon Sep 17 00:00:00 2001 From: Emilio Perez Date: Mon, 31 Aug 2020 18:40:34 +0100 Subject: nixos/fontdir: use regexp to find font files --- nixos/modules/config/fonts/fontdir.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/nixos/modules/config/fonts/fontdir.nix b/nixos/modules/config/fonts/fontdir.nix index 45d821e7e88..098038fa6d2 100644 --- a/nixos/modules/config/fonts/fontdir.nix +++ b/nixos/modules/config/fonts/fontdir.nix @@ -5,13 +5,10 @@ with lib; let x11Fonts = pkgs.runCommand "X11-fonts" { preferLocalBuild = true; } '' - font_formats=('ttf' 'otf' 'pcf' 'pfa' 'pfb' 'bdf') mkdir -p "$out/share/X11-fonts" - for fmt in "''${font_formats[@]}"; do - find ${toString config.fonts.fonts} \ - \( -name '*.'$fmt -o -name '*.'$fmt'.gz' \) \ - -exec ln -sf -t "$out/share/X11-fonts" '{}' \; - done + font_regexp='.*\.\(ttf\|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" ${pkgs.xorg.mkfontscale}/bin/mkfontscale ${pkgs.xorg.mkfontdir}/bin/mkfontdir -- cgit 1.4.1