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