diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-05-15 22:04:47 +0000 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-05-15 22:04:47 +0000 |
commit | 8846bef01343963021300d4d4089ab3031197df6 (patch) | |
tree | fa3c1e956364f6d0f0d436d15d772779dac95ba4 /pkgs/development/libraries/fontconfig/default.nix | |
parent | 1a4d1facda6c0686449acb2bc55a3299219aa133 (diff) | |
download | nixpkgs-8846bef01343963021300d4d4089ab3031197df6.tar nixpkgs-8846bef01343963021300d4d4089ab3031197df6.tar.gz nixpkgs-8846bef01343963021300d4d4089ab3031197df6.tar.bz2 nixpkgs-8846bef01343963021300d4d4089ab3031197df6.tar.lz nixpkgs-8846bef01343963021300d4d4089ab3031197df6.tar.xz nixpkgs-8846bef01343963021300d4d4089ab3031197df6.tar.zst nixpkgs-8846bef01343963021300d4d4089ab3031197df6.zip |
* Fontconfig updated to 2.9.0.
svn path=/nixpkgs/branches/x-updates/; revision=34130
Diffstat (limited to 'pkgs/development/libraries/fontconfig/default.nix')
-rw-r--r-- | pkgs/development/libraries/fontconfig/default.nix | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/development/libraries/fontconfig/default.nix b/pkgs/development/libraries/fontconfig/default.nix index 8e016401e3d..5ab3bf2e235 100644 --- a/pkgs/development/libraries/fontconfig/default.nix +++ b/pkgs/development/libraries/fontconfig/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, freetype, expat }: stdenv.mkDerivation rec { - name = "fontconfig-2.8.0"; + name = "fontconfig-2.9.0"; src = fetchurl { url = "http://fontconfig.org/release/${name}.tar.gz"; - sha256 = "0d9370qnn1qzq0jidbycin2frkcr1kqj04jbgb79ykb5x9p1qaps"; + sha256 = "06ml04gyfacasxmrqdjfkckbj5f18d988j3wmz6vsi7h3h3jazna"; }; buildInputs = [ freetype ]; @@ -17,13 +17,14 @@ stdenv.mkDerivation rec { crossArch = if (stdenv ? cross && stdenv.cross != null) then stdenv.cross.arch else null; - preConfigure = '' if test -n "$crossConfig"; then configureFlags="$configureFlags --with-arch=$crossArch"; fi ''; + enableParallelBuilding = true; + # Don't try to write to /etc/fonts or /var/cache/fontconfig at install time. installFlags = "CONFDIR=$(out)/etc/fonts RUN_FC_CACHE_TEST=false fc_cachedir=$(TMPDIR)/dummy"; |