diff options
| author | Emilio Perez <emilio.perez-juarez@diamond.ac.uk> | 2020-09-02 02:59:58 +0100 |
|---|---|---|
| committer | Emilio Perez <emilio.perez-juarez@diamond.ac.uk> | 2020-10-04 14:56:30 +0100 |
| commit | 52f028f2d9f398e891f4a23056ec9e16c4beb409 (patch) | |
| tree | 5bdf4434ae26f9edf0f19802d487d8b371bda746 /pkgs/servers/x11 | |
| parent | f41f53dc49d4d593bfeb977c05b8a730fd3654dd (diff) | |
nixos/xwayland: add new module and allow configuring a default font path
- Add option `programs.xwayland.defaultFontPath`
- Modify sway to enable Xwayland
Diffstat (limited to 'pkgs/servers/x11')
| -rw-r--r-- | pkgs/servers/x11/xorg/xwayland.nix | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/servers/x11/xorg/xwayland.nix b/pkgs/servers/x11/xorg/xwayland.nix index a60025b79779..e10ba1069f05 100644 --- a/pkgs/servers/x11/xorg/xwayland.nix +++ b/pkgs/servers/x11/xorg/xwayland.nix @@ -1,4 +1,6 @@ -{ stdenv, wayland, wayland-protocols, xorgserver, xkbcomp, xkeyboard_config, epoxy, libxslt, libunwind, makeWrapper, egl-wayland }: +{ stdenv, wayland, wayland-protocols, xorgserver, xkbcomp, xkeyboard_config +, epoxy, libxslt, libunwind, makeWrapper, egl-wayland +, defaultFontPath ? "" }: with stdenv.lib; @@ -19,7 +21,7 @@ xorgserver.overrideAttrs (oldAttrs: { "--disable-xquartz" "--disable-xwin" "--enable-glamor" - "--with-default-font-path=" + "--with-default-font-path=${defaultFontPath}" "--with-xkb-bin-directory=${xkbcomp}/bin" "--with-xkb-path=${xkeyboard_config}/etc/X11/xkb" "--with-xkb-output=$(out)/share/X11/xkb/compiled" |