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 | |
| parent | f7e83a32ad3a8ba10f1d51c300e6744c06be867c (diff) | |
| download | nixpkgs-e4436ad8417d8a8b1188bdc0b8cee68211e8f8e3.tar nixpkgs-e4436ad8417d8a8b1188bdc0b8cee68211e8f8e3.tar.gz nixpkgs-e4436ad8417d8a8b1188bdc0b8cee68211e8f8e3.tar.bz2 nixpkgs-e4436ad8417d8a8b1188bdc0b8cee68211e8f8e3.tar.lz nixpkgs-e4436ad8417d8a8b1188bdc0b8cee68211e8f8e3.tar.xz nixpkgs-e4436ad8417d8a8b1188bdc0b8cee68211e8f8e3.tar.zst nixpkgs-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')
| -rw-r--r-- | nixos/modules/config/fonts/fontconfig.nix | 5 | ||||
| -rw-r--r-- | nixos/modules/services/x11/display-managers/lightdm.nix | 3 | ||||
| -rw-r--r-- | nixos/modules/services/x11/xserver.nix | 2 |
3 files changed, 2 insertions, 8 deletions
diff --git a/nixos/modules/config/fonts/fontconfig.nix b/nixos/modules/config/fonts/fontconfig.nix index cf70ca264d6..7516d7ddf1a 100644 --- a/nixos/modules/config/fonts/fontconfig.nix +++ b/nixos/modules/config/fonts/fontconfig.nix @@ -47,11 +47,6 @@ with lib; </fontconfig> ''; - # FIXME: This variable is no longer needed, but we'll keep it - # around for a while for applications linked against old - # fontconfig builds. - environment.variables.FONTCONFIG_FILE = "/etc/fonts/fonts.conf"; - environment.systemPackages = [ pkgs.fontconfig ]; }; diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix index f8ce06738fe..98e3fd6d6a5 100644 --- a/nixos/modules/services/x11/display-managers/lightdm.nix +++ b/nixos/modules/services/x11/display-managers/lightdm.nix @@ -28,11 +28,10 @@ let buildCommand = '' mkdir -p $out/gtk-3.0/ - # This wrapper ensures that we actually get fonts + # This wrapper ensures that we actually get ?? (fonts should be OK now) makeWrapper ${pkgs.lightdm_gtk_greeter}/sbin/lightdm-gtk-greeter \ $out/greeter \ --set XDG_DATA_DIRS ${pkgs.gnome2.gnome_icon_theme}/share \ - --set FONTCONFIG_FILE /etc/fonts/fonts.conf \ --set XDG_CONFIG_HOME $out/ # We need this to ensure that it actually tries to find icons from gnome-icon-theme diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix index 1ce8de23c16..f911d3c81f9 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 ":" ( |