diff options
| -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 | ||||
| -rw-r--r-- | pkgs/games/steam/chrootenv.nix | 1 | ||||
| -rw-r--r-- | pkgs/tools/X11/bumblebee/default.nix | 1 |
5 files changed, 2 insertions, 10 deletions
diff --git a/nixos/modules/config/fonts/fontconfig.nix b/nixos/modules/config/fonts/fontconfig.nix index cf70ca264d6a..7516d7ddf1a6 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 f8ce06738fee..98e3fd6d6a5d 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 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 ":" ( diff --git a/pkgs/games/steam/chrootenv.nix b/pkgs/games/steam/chrootenv.nix index 75bbca67ab07..404eaf4ce9f2 100644 --- a/pkgs/games/steam/chrootenv.nix +++ b/pkgs/games/steam/chrootenv.nix @@ -68,6 +68,5 @@ buildFHSChrootEnv { profile = '' export LD_LIBRARY_PATH=/run/opengl-driver/lib:/run/opengl-driver-32/lib:/lib:/lib32:/lib64 export PATH=$PATH:/usr/bin:/usr/sbin - export FONTCONFIG_FILE=/etc/fonts/fonts.conf ''; } diff --git a/pkgs/tools/X11/bumblebee/default.nix b/pkgs/tools/X11/bumblebee/default.nix index 58db0c13abb2..f3b5208de871 100644 --- a/pkgs/tools/X11/bumblebee/default.nix +++ b/pkgs/tools/X11/bumblebee/default.nix @@ -88,7 +88,6 @@ in stdenv.mkDerivation { wrapProgram "$out/sbin/bumblebeed" \ --prefix PATH : "${commonEnv}/sbin:${commonEnv}/bin:\$PATH" \ --prefix LD_LIBRARY_PATH : "${commonEnv}/lib:\$LD_LIBRARY_PATH" \ - --set FONTCONFIG_FILE "/etc/fonts/fonts.conf" \ --set XKB_BINDIR "${xorg.xkbcomp}/bin" \ --set XKB_DIR "${xkeyboard_config}/etc/X11/xkb" |