diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-06-28 18:01:51 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-28 18:01:51 +0000 |
| commit | c5b82a046f98d23dfc11c2c2cc2da97c621f0df8 (patch) | |
| tree | ef9e31295938aad245693da872d204f07944e0fe /nixos/modules/config | |
| parent | 291da905ac0e4bbff1fd87c773d4e508db86d973 (diff) | |
| parent | 946b824dbb16bc32826a5c5f0d192952165e6f67 (diff) | |
| download | nixpkgs-c5b82a046f98d23dfc11c2c2cc2da97c621f0df8.tar nixpkgs-c5b82a046f98d23dfc11c2c2cc2da97c621f0df8.tar.gz nixpkgs-c5b82a046f98d23dfc11c2c2cc2da97c621f0df8.tar.bz2 nixpkgs-c5b82a046f98d23dfc11c2c2cc2da97c621f0df8.tar.lz nixpkgs-c5b82a046f98d23dfc11c2c2cc2da97c621f0df8.tar.xz nixpkgs-c5b82a046f98d23dfc11c2c2cc2da97c621f0df8.tar.zst nixpkgs-c5b82a046f98d23dfc11c2c2cc2da97c621f0df8.zip | |
Merge staging-next into staging
Diffstat (limited to 'nixos/modules/config')
| -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 30e0dfe2566..9d41463c947 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\|ttc\|otf\|pcf\|pfa\|pfb\|bdf\)\(\.gz\)?' + font_regexp='.*\.\(ttf\|ttc\|otb\|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" |