diff options
| author | Jonathan Ringer <jonringer117@gmail.com> | 2020-09-29 19:41:34 -0700 |
|---|---|---|
| committer | Jon <jonringer@users.noreply.github.com> | 2020-09-30 09:09:56 -0700 |
| commit | 46e27bcb16760607e6a17e89c0ca27e3e0eb7be6 (patch) | |
| tree | 631d3942c55c01104ce2b2372923bacc8def3b96 | |
| parent | d343cd62d593a41037fb44493d6ce12073edb83b (diff) | |
| download | nixpkgs-46e27bcb16760607e6a17e89c0ca27e3e0eb7be6.tar nixpkgs-46e27bcb16760607e6a17e89c0ca27e3e0eb7be6.tar.gz nixpkgs-46e27bcb16760607e6a17e89c0ca27e3e0eb7be6.tar.bz2 nixpkgs-46e27bcb16760607e6a17e89c0ca27e3e0eb7be6.tar.lz nixpkgs-46e27bcb16760607e6a17e89c0ca27e3e0eb7be6.tar.xz nixpkgs-46e27bcb16760607e6a17e89c0ca27e3e0eb7be6.tar.zst nixpkgs-46e27bcb16760607e6a17e89c0ca27e3e0eb7be6.zip | |
nixos/tests: fix x11 tests
| -rw-r--r-- | nixos/modules/config/fonts/fonts.nix | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/nixos/modules/config/fonts/fonts.nix b/nixos/modules/config/fonts/fonts.nix index b9bae44b2f9..3911196c101 100644 --- a/nixos/modules/config/fonts/fonts.nix +++ b/nixos/modules/config/fonts/fonts.nix @@ -35,19 +35,21 @@ with lib; config = { fonts.fonts = mkIf config.fonts.enableDefaultFonts - [ - pkgs.xorg.fontbhlucidatypewriter100dpi - pkgs.xorg.fontbhlucidatypewriter75dpi + ([ pkgs.dejavu_fonts pkgs.freefont_ttf pkgs.gyre-fonts # TrueType substitutes for standard PostScript fonts pkgs.liberation_ttf - pkgs.xorg.fontbh100dpi pkgs.xorg.fontmiscmisc pkgs.xorg.fontcursormisc pkgs.unifont pkgs.noto-fonts-emoji - ]; + ] ++ lib.optionals (config.nixpkgs.config.allowUnfree or false) [ + # these are unfree, and will make usage with xserver fail + pkgs.xorg.fontbhlucidatypewriter100dpi + pkgs.xorg.fontbhlucidatypewriter75dpi + pkgs.xorg.fontbh100dpi + ]); }; |