Unverified Commit 9ae8af51 authored by Quentin Smith's avatar Quentin Smith
Browse files

xquartz: Allow extra font directories to be passed

parent d018f767

pkgs/servers/x11/xquartz/default.nix

+7 −4
Original line number Diff line number Diff line
@@ -2,6 +2,8 @@ 
, quartz-wm, fontconfig, xlsfonts, xfontsel

, ttf_bitstream_vera, freefont_ttf, liberation_ttf

, shell ? "${bashInteractive}/bin/bash"

, unfreeFonts ? false

, extraFontDirs ? []

}:



# ------------
@@ -60,15 +62,16 @@ let 
    sudo launchctl load -w /Library/LaunchDaemons/$daemonName

  '';

  fontDirs = [

    xorg.fontbhlucidatypewriter100dpi

    xorg.fontbhlucidatypewriter75dpi

    ttf_bitstream_vera

    freefont_ttf

    liberation_ttf

    xorg.fontbh100dpi

    xorg.fontmiscmisc

    xorg.fontcursormisc

  ];

  ] ++ lib.optionals unfreeFonts [

    xorg.fontbhlucidatypewriter100dpi

    xorg.fontbhlucidatypewriter75dpi

    xorg.fontbh100dpi

  ] ++ extraFontDirs;

  fontsConf = makeFontsConf {

    fontDirectories = fontDirs ++ [

      "/Library/Fonts"