diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-05-07 13:03:25 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-05-07 13:03:25 +0200 |
| commit | d4561be1cb5032c00cf97fc82397f1307f156996 (patch) | |
| tree | 0e49a5e1a92c24f5a6e08ce34b162b0d1f7d7f0b /pkgs/development/libraries/freetype | |
| parent | 16c59ef83672aa41aae47f6603e7bd8fb185c3f3 (diff) | |
| download | nixpkgs-d4561be1cb5032c00cf97fc82397f1307f156996.tar nixpkgs-d4561be1cb5032c00cf97fc82397f1307f156996.tar.gz nixpkgs-d4561be1cb5032c00cf97fc82397f1307f156996.tar.bz2 nixpkgs-d4561be1cb5032c00cf97fc82397f1307f156996.tar.lz nixpkgs-d4561be1cb5032c00cf97fc82397f1307f156996.tar.xz nixpkgs-d4561be1cb5032c00cf97fc82397f1307f156996.tar.zst nixpkgs-d4561be1cb5032c00cf97fc82397f1307f156996.zip | |
fontconfig: Use /etc/fonts by default again
This removes the need to set $FONTCONFIG_FILE, which is especially important when using Nixpkgs binaries on non-NixOS systems. See also 9301524c500e7e7567d5da54b3f3d7d07e53d921. This is a regression caused by a change in fontconfig's configure switches.
Diffstat (limited to 'pkgs/development/libraries/freetype')
| -rw-r--r-- | pkgs/development/libraries/freetype/default.nix | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/pkgs/development/libraries/freetype/default.nix b/pkgs/development/libraries/freetype/default.nix index d79acf03bfd..cff22e9bc57 100644 --- a/pkgs/development/libraries/freetype/default.nix +++ b/pkgs/development/libraries/freetype/default.nix @@ -9,7 +9,9 @@ assert !(useEncumberedCode && useInfinality); # probably wouldn't make sense let + version = "2.4.11"; + infinality = rec { inherit useInfinality; vers = "20130104"; @@ -21,6 +23,7 @@ let }; in + stdenv.mkDerivation rec { name = "freetype-${version}"; @@ -38,8 +41,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = with stdenv.lib; " -fno-strict-aliasing" # from Gentoo, see https://bugzilla.redhat.com/show_bug.cgi?id=506840 + optionalString useEncumberedCode " -DFT_CONFIG_OPTION_SUBPIXEL_RENDERING=1" - + optionalString useInfinality " -DTT_CONFIG_OPTION_SUBPIXEL_HINTING=1" - ; + + optionalString useInfinality " -DTT_CONFIG_OPTION_SUBPIXEL_HINTING=1"; patches = [ ./enable-validation.patch ] # from Gentoo ++ stdenv.lib.optional useInfinality [ infinality_patch ]; @@ -51,6 +53,7 @@ stdenv.mkDerivation rec { buildInputs = stdenv.lib.optional (!stdenv.isLinux) gnumake; enableParallelBuilding = true; + doCheck = true; postInstall = |