dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #99373 from 7c6f434c/xdummy-fix-unfree

Browse Source 
xdummy: make unfree fonts optional; see also #99136
This commit is contained in:
Michael Raskin 2020-10-02 13:47:35 +00:00 committed by GitHub
commit bb4060dea0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/tools/misc/xdummy/default.nix
View File

@ -1,4 +1,5 @@
{ writeText, writeScriptBin, xorg, xkeyboard_config, runtimeShell }: { writeText, writeScriptBin, xorg, xkeyboard_config, runtimeShell
, unfreeFonts ? false, lib}:
let let
xorgConfig = writeText "dummy-xorg.conf" '' xorgConfig = writeText "dummy-xorg.conf" ''
@ -23,11 +24,13 @@ let
XkbDir "${xkeyboard_config}/share/X11/xkb" XkbDir "${xkeyboard_config}/share/X11/xkb"
FontPath "${xorg.fontadobe75dpi}/lib/X11/fonts/75dpi" FontPath "${xorg.fontadobe75dpi}/lib/X11/fonts/75dpi"
FontPath "${xorg.fontadobe100dpi}/lib/X11/fonts/100dpi" 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.fontbhlucidatypewriter75dpi}/lib/X11/fonts/75dpi"
FontPath "${xorg.fontbhlucidatypewriter100dpi}/lib/X11/fonts/100dpi" FontPath "${xorg.fontbhlucidatypewriter100dpi}/lib/X11/fonts/100dpi"
FontPath "${xorg.fontbh100dpi}/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 EndSection
Section "Module" Section "Module"