pyrox.dev / nixpkgs
lol
fork atom

xdummy: make unfree fonts optional; see also #99136

Michael Raskin 30ec2df8 6353c2de

+6 -3
unified split
+6 -3
pkgs/tools/misc/xdummy/default.nix
··· 1 - { writeText, writeScriptBin, xorg, xkeyboard_config, runtimeShell }: 1 + { writeText, writeScriptBin, xorg, xkeyboard_config, runtimeShell 2 + , unfreeFonts ? false, lib}: 2 3 3 4 let 4 5 xorgConfig = writeText "dummy-xorg.conf" '' ··· 23 24 XkbDir "${xkeyboard_config}/share/X11/xkb" 24 25 FontPath "${xorg.fontadobe75dpi}/lib/X11/fonts/75dpi" 25 26 FontPath "${xorg.fontadobe100dpi}/lib/X11/fonts/100dpi" 27 + FontPath "${xorg.fontmiscmisc}/lib/X11/fonts/misc" 28 + FontPath "${xorg.fontcursormisc}/lib/X11/fonts/misc" 29 + ${lib.optionalString unfreeFonts '' 26 30 FontPath "${xorg.fontbhlucidatypewriter75dpi}/lib/X11/fonts/75dpi" 27 31 FontPath "${xorg.fontbhlucidatypewriter100dpi}/lib/X11/fonts/100dpi" 28 32 FontPath "${xorg.fontbh100dpi}/lib/X11/fonts/100dpi" 29 - FontPath "${xorg.fontmiscmisc}/lib/X11/fonts/misc" 30 - FontPath "${xorg.fontcursormisc}/lib/X11/fonts/misc" 33 + ''} 31 34 EndSection 32 35 33 36 Section "Module"