This reverts commit 32a4081a7f.
After ec985c8ff the apps linked to 2.11 fontconfig run fine on nixos
with older /etc/fonts/, but the other way won't work.
Unfortunately, I see no easy work-around ATM.
Since fontconfig-2.11 the xml:space attribute makes it reject
/etc/fonts/fonts.conf, so it renders garbage and eats lots of CPU.
To use anything linked to fontconfig-2.11 you need to have this patch
applied to your running NixOS. That's why I'm pushing it to master
before the fontconfig update (as soon as I found and tested the fix).
Conflicts (a little tricky, I did some cleanup of interacting changes):
pkgs/development/compilers/llvm/default.nix
pkgs/development/libraries/libpng/default.nix
pkgs/tools/package-management/nixops/default.nix
pkgs/top-level/all-packages.nix
Otherwise the user won't be able to override anything specified in
NixOS' /etc/fonts/conf.d, since ~/.config/fontconfig is included from
upstream fonts/conf.5/50-user.conf.
This removes the need to set $FONTCONFIG_FILE, which is especially
important when using Nixpkgs binaries on non-NixOS systems.
See also 9301524c50. This is a
regression caused by a change in fontconfig's configure switches.
I was trying to cross compile SDL. Many dependencies work, but I ended seeing
libX11 not ready for cross compilation. Other xorg libraries cross-compile
well. libX11 may need a small patch. The problem is the usual "configure test
cannot be run in cross compilation", so the configure script halts.
I made the pkgconfig expression always return buildDrv, as I think it rarely
will be needed as buildInput. So to avoid rewriting all its mentions to use
it as buildNativeInput, I prefered this small change.
svn path=/nixpkgs/branches/stdenv-updates/; revision=18500
configuration directory so that users on other distributions don't
need to set $FONTCONFIG_FILE (NIXPKGS-29). Also use
/var/cache/fontconfig for the cache to prevent programs run by root
from writing into the Nix store.
svn path=/nixpkgs/branches/xorg-7.5/; revision=18021
support.
* New function makeFontsConf to generate a fontconfig configuration
file. Moved from NixOS.
* dot2pdf: use makeFontsConf to generate a fonts.conf containing just
the Ghostscript fonts (see NIXPKGS-29).
* dot2pdf: generate PDF directly, don't go through PS. Note that this
and using fontconfig changes the interpretation of "fontname"
attributes in dot graphs.
svn path=/nixpkgs/trunk/; revision=12251
