diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2020-10-02 11:42:59 +0200 |
|---|---|---|
| committer | Michael Raskin <7c6f434c@mail.ru> | 2020-10-02 11:42:59 +0200 |
| commit | 30ec2df88b70c764cecc129606dbb30e4e2a0955 (patch) | |
| tree | 03bce2807667bc663d8043b7409ff57dc533053d /pkgs/tools/misc/xdummy | |
| parent | 6353c2dee299caa273a92bbcc05c5f5281410bbe (diff) | |
xdummy: make unfree fonts optional; see also #99136
Diffstat (limited to 'pkgs/tools/misc/xdummy')
| -rw-r--r-- | pkgs/tools/misc/xdummy/default.nix | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/pkgs/tools/misc/xdummy/default.nix b/pkgs/tools/misc/xdummy/default.nix index 7d7942f7ca983..227829346cd08 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" |