public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FONTCONFIG_FILE: remove setters to /etc/fonts/fonts.conf

Browse Source 
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.
This commit is contained in:
Vladimír Čunát 2014-09-28 15:11:10 +02:00
parent f7e83a32ad
commit e4436ad841
5 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nixos/modules/config/fonts/fontconfig.nix
View File

@ -47,11 +47,6 @@ with lib;
</fontconfig> </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 ]; environment.systemPackages = [ pkgs.fontconfig ];
}; };

3
nixos/modules/services/x11/display-managers/lightdm.nix
View File

@ -28,11 +28,10 @@ let
buildCommand = '' buildCommand = ''
mkdir -p $out/gtk-3.0/ 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 \ makeWrapper ${pkgs.lightdm_gtk_greeter}/sbin/lightdm-gtk-greeter \
$out/greeter \ $out/greeter \
--set XDG_DATA_DIRS ${pkgs.gnome2.gnome_icon_theme}/share \ --set XDG_DATA_DIRS ${pkgs.gnome2.gnome_icon_theme}/share \
--set FONTCONFIG_FILE /etc/fonts/fonts.conf \
--set XDG_CONFIG_HOME $out/ --set XDG_CONFIG_HOME $out/
# We need this to ensure that it actually tries to find icons from gnome-icon-theme # We need this to ensure that it actually tries to find icons from gnome-icon-theme

2
nixos/modules/services/x11/xserver.nix
View File

@ -458,7 +458,7 @@ in
restartIfChanged = false; restartIfChanged = false;
environment = environment =
{ FONTCONFIG_FILE = "/etc/fonts/fonts.conf"; # !!! cleanup {
XKB_BINDIR = "${xorg.xkbcomp}/bin"; # Needed for the Xkb extension. 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. XORG_DRI_DRIVER_PATH = "/run/opengl-driver/lib/dri"; # !!! Depends on the driver selected at runtime.
LD_LIBRARY_PATH = concatStringsSep ":" ( LD_LIBRARY_PATH = concatStringsSep ":" (

1
pkgs/games/steam/chrootenv.nix
View File

@ -68,6 +68,5 @@ buildFHSChrootEnv {
profile = '' profile = ''
export LD_LIBRARY_PATH=/run/opengl-driver/lib:/run/opengl-driver-32/lib:/lib:/lib32:/lib64 export LD_LIBRARY_PATH=/run/opengl-driver/lib:/run/opengl-driver-32/lib:/lib:/lib32:/lib64
export PATH=$PATH:/usr/bin:/usr/sbin export PATH=$PATH:/usr/bin:/usr/sbin
export FONTCONFIG_FILE=/etc/fonts/fonts.conf
''; '';
} }

1
pkgs/tools/X11/bumblebee/default.nix
View File

@ -88,7 +88,6 @@ in stdenv.mkDerivation {
wrapProgram "$out/sbin/bumblebeed" \ wrapProgram "$out/sbin/bumblebeed" \
--prefix PATH : "${commonEnv}/sbin:${commonEnv}/bin:\$PATH" \ --prefix PATH : "${commonEnv}/sbin:${commonEnv}/bin:\$PATH" \
--prefix LD_LIBRARY_PATH : "${commonEnv}/lib:\$LD_LIBRARY_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_BINDIR "${xorg.xkbcomp}/bin" \
--set XKB_DIR "${xkeyboard_config}/etc/X11/xkb" --set XKB_DIR "${xkeyboard_config}/etc/X11/xkb"