diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2014-09-28 15:11:10 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2014-10-05 17:05:27 +0200 |
| commit | e4436ad8417d8a8b1188bdc0b8cee68211e8f8e3 (patch) | |
| tree | f1e0b1c787f823bc0095724acbabcc12b8de3b56 /nixos/modules/services/x11/xserver.nix | |
| parent | f7e83a32ad3a8ba10f1d51c300e6744c06be867c (diff) | |
| download | nixlib-e4436ad8417d8a8b1188bdc0b8cee68211e8f8e3.tar nixlib-e4436ad8417d8a8b1188bdc0b8cee68211e8f8e3.tar.gz nixlib-e4436ad8417d8a8b1188bdc0b8cee68211e8f8e3.tar.bz2 nixlib-e4436ad8417d8a8b1188bdc0b8cee68211e8f8e3.tar.lz nixlib-e4436ad8417d8a8b1188bdc0b8cee68211e8f8e3.tar.xz nixlib-e4436ad8417d8a8b1188bdc0b8cee68211e8f8e3.tar.zst nixlib-e4436ad8417d8a8b1188bdc0b8cee68211e8f8e3.zip | |
FONTCONFIG_FILE: remove setters to /etc/fonts/fonts.conf
Any reasonably new version of fontconfig does search that path by default, and setting this globally causes problems, as 2.10 and 2.11 need incompatible configs. Tested: slim+xfce desktop, chrootenv-ed steam. I have no idea why we were setting the global variable; e.g., neither Fedora nor Ubuntu does that.
Diffstat (limited to 'nixos/modules/services/x11/xserver.nix')
| -rw-r--r-- | nixos/modules/services/x11/xserver.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix index 1ce8de23c16d..f911d3c81f90 100644 --- a/nixos/modules/services/x11/xserver.nix +++ b/nixos/modules/services/x11/xserver.nix @@ -458,7 +458,7 @@ in restartIfChanged = false; environment = - { FONTCONFIG_FILE = "/etc/fonts/fonts.conf"; # !!! cleanup + { XKB_BINDIR = "${xorg.xkbcomp}/bin"; # Needed for the Xkb extension. XORG_DRI_DRIVER_PATH = "/run/opengl-driver/lib/dri"; # !!! Depends on the driver selected at runtime. LD_LIBRARY_PATH = concatStringsSep ":" ( |