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 /pkgs/tools/X11 | |
| 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 'pkgs/tools/X11')
| -rw-r--r-- | pkgs/tools/X11/bumblebee/default.nix | 1 |
1 files changed, 0 insertions, 1 deletions
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" |