From 30ec2df88b70c764cecc129606dbb30e4e2a0955 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Fri, 2 Oct 2020 11:42:59 +0200 Subject: [PATCH] xdummy: make unfree fonts optional; see also #99136 --- pkgs/tools/misc/xdummy/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/xdummy/default.nix b/pkgs/tools/misc/xdummy/default.nix index 7d7942f7ca9..227829346cd 100644 --- a/pkgs/tools/misc/xdummy/default.nix +++ b/pkgs/tools/misc/xdummy/default.nix @@ -1,4 +1,5 @@ -{ writeText, writeScriptBin, xorg, xkeyboard_config, runtimeShell }: +{ writeText, writeScriptBin, xorg, xkeyboard_config, runtimeShell +, unfreeFonts ? false, lib}: let xorgConfig = writeText "dummy-xorg.conf" '' @@ -23,11 +24,13 @@ let XkbDir "${xkeyboard_config}/share/X11/xkb" FontPath "${xorg.fontadobe75dpi}/lib/X11/fonts/75dpi" FontPath "${xorg.fontadobe100dpi}/lib/X11/fonts/100dpi" + FontPath "${xorg.fontmiscmisc}/lib/X11/fonts/misc" + FontPath "${xorg.fontcursormisc}/lib/X11/fonts/misc" + ${lib.optionalString unfreeFonts '' FontPath "${xorg.fontbhlucidatypewriter75dpi}/lib/X11/fonts/75dpi" FontPath "${xorg.fontbhlucidatypewriter100dpi}/lib/X11/fonts/100dpi" FontPath "${xorg.fontbh100dpi}/lib/X11/fonts/100dpi" - FontPath "${xorg.fontmiscmisc}/lib/X11/fonts/misc" - FontPath "${xorg.fontcursormisc}/lib/X11/fonts/misc" + ''} EndSection Section "Module"