diff options
| author | Michele Guerini Rocco <rnhmjoj@users.noreply.github.com> | 2020-10-05 21:20:06 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-05 21:20:06 +0200 |
| commit | 04670f8b3de20e94ad864b36ab1a746d5ed7107e (patch) | |
| tree | 8e6ec8817004c1991b01d2ccb90ec657e53a215c /pkgs | |
| parent | 1781e11061e7d5db308d093f84002d0d521935d9 (diff) | |
| parent | 9f8aad2ca6e8fe683448172625db5a47c88ff5f0 (diff) | |
| download | nixpkgs-04670f8b3de20e94ad864b36ab1a746d5ed7107e.tar nixpkgs-04670f8b3de20e94ad864b36ab1a746d5ed7107e.tar.gz nixpkgs-04670f8b3de20e94ad864b36ab1a746d5ed7107e.tar.bz2 nixpkgs-04670f8b3de20e94ad864b36ab1a746d5ed7107e.tar.lz nixpkgs-04670f8b3de20e94ad864b36ab1a746d5ed7107e.tar.xz nixpkgs-04670f8b3de20e94ad864b36ab1a746d5ed7107e.tar.zst nixpkgs-04670f8b3de20e94ad864b36ab1a746d5ed7107e.zip | |
Merge pull request #96697 from hir12111/fix-font-dir
fontdir: Consider scalable fonts in index fonts.dir
Diffstat (limited to 'pkgs')
| -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 a60025b7977..e10ba1069f0 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" |