diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2014-06-09 19:47:31 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2014-06-17 09:00:29 +0200 |
commit | c50f0e47e14d2dec088ce4b9bed6228232607869 (patch) | |
tree | 0886e6b1933cc07412a6acb4de90fd91f4962911 /pkgs/development/libraries/fontconfig/default.nix | |
parent | ff327554e97acfe27d0817b81da65e27aacbe1f7 (diff) | |
download | nixpkgs-c50f0e47e14d2dec088ce4b9bed6228232607869.tar nixpkgs-c50f0e47e14d2dec088ce4b9bed6228232607869.tar.gz nixpkgs-c50f0e47e14d2dec088ce4b9bed6228232607869.tar.bz2 nixpkgs-c50f0e47e14d2dec088ce4b9bed6228232607869.tar.lz nixpkgs-c50f0e47e14d2dec088ce4b9bed6228232607869.tar.xz nixpkgs-c50f0e47e14d2dec088ce4b9bed6228232607869.tar.zst nixpkgs-c50f0e47e14d2dec088ce4b9bed6228232607869.zip |
freetype: major update, including some CVE security
- There's no fontconfig update yet, as I failed to debug it yet. - Infinality patches are now taken from a different (maintained) source.
Diffstat (limited to 'pkgs/development/libraries/fontconfig/default.nix')
-rw-r--r-- | pkgs/development/libraries/fontconfig/default.nix | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/pkgs/development/libraries/fontconfig/default.nix b/pkgs/development/libraries/fontconfig/default.nix index 89feb3df8d5..73461b077de 100644 --- a/pkgs/development/libraries/fontconfig/default.nix +++ b/pkgs/development/libraries/fontconfig/default.nix @@ -8,18 +8,22 @@ stdenv.mkDerivation rec { sha256 = "0llraqw86jmw4vzv7inskp3xxm2gc64my08iwq5mzncgfdbfza4f"; }; - infinality_patch = with freetype.infinality; if useInfinality - then let subvers = "1"; + infinality_patch = + let subvers = "1"; in fetchurl { url = http://www.infinality.net/fedora/linux/zips/fontconfig-infinality-1-20130104_1.tar.bz2; sha256 = "1fm5xx0mx2243jrq5rxk4v0ajw2nawpj23399h710bx6hd1rviq7"; } - else null; + ; propagatedBuildInputs = [ freetype ]; buildInputs = [ pkgconfig expat ]; - configureFlags = "--sysconfdir=/etc --with-cache-dir=/var/cache/fontconfig --disable-docs --with-default-fonts="; + configureFlags = [ + "--with-cache-dir=/var/cache/fontconfig" + "--disable-docs" + "--with-default-fonts=" + ]; # We should find a better way to access the arch reliably. crossArch = stdenv.cross.arch or null; @@ -32,10 +36,12 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - # Don't try to write to /etc/fonts or /var/cache/fontconfig at install time. - installFlags = "sysconfdir=$(out)/etc RUN_FC_CACHE_TEST=false fc_cachedir=$(TMPDIR)/dummy"; + doCheck = true; - postInstall = stdenv.lib.optionalString freetype.infinality.useInfinality '' + # Don't try to write to /var/cache/fontconfig at install time. + installFlags = "fc_cachedir=$(TMPDIR)/dummy"; + + postInstall = '' cd "$out/etc/fonts" && tar xvf ${infinality_patch} ''; |