diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2018-03-06 13:01:33 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2018-03-06 13:09:19 +0300 |
| commit | a536aee981fb20670b03a55357719dd771e780c2 (patch) | |
| tree | 4c60017438b4b6ef6826c95e50db6d964bc573e0 /pkgs | |
| parent | 0b455cec930910cdaf128a246a1cb110c0738ae2 (diff) | |
| download | nixpkgs-a536aee981fb20670b03a55357719dd771e780c2.tar nixpkgs-a536aee981fb20670b03a55357719dd771e780c2.tar.gz nixpkgs-a536aee981fb20670b03a55357719dd771e780c2.tar.bz2 nixpkgs-a536aee981fb20670b03a55357719dd771e780c2.tar.lz nixpkgs-a536aee981fb20670b03a55357719dd771e780c2.tar.xz nixpkgs-a536aee981fb20670b03a55357719dd771e780c2.tar.zst nixpkgs-a536aee981fb20670b03a55357719dd771e780c2.zip | |
fontconfig: 2.12.1 -> 2.12.6
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/fontconfig/default.nix | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/pkgs/development/libraries/fontconfig/default.nix b/pkgs/development/libraries/fontconfig/default.nix index 1109582ad64..29838fe1ffa 100644 --- a/pkgs/development/libraries/fontconfig/default.nix +++ b/pkgs/development/libraries/fontconfig/default.nix @@ -1,5 +1,5 @@ { stdenv, substituteAll, fetchurl, fetchpatch -, pkgconfig, freetype, expat, libxslt, dejavu_fonts +, pkgconfig, freetype, expat, libxslt, gperf, dejavu_fonts , hostPlatform }: @@ -18,11 +18,12 @@ let configVersion = "2.11"; # bump whenever fontconfig breaks compatibility with older configurations in stdenv.mkDerivation rec { - name = "fontconfig-2.12.1"; + name = "fontconfig-${version}"; + version = "2.12.6"; src = fetchurl { url = "http://fontconfig.org/release/${name}.tar.bz2"; - sha256 = "1wy7svvp7df6bjpg1m5vizb3ngd7rhb20vpclv3x3qa71khs6jdl"; + sha256 = "05zh65zni11kgnhg726gjbrd55swspdvhqbcnj5a5xh8gn03036g"; }; patches = [ @@ -30,23 +31,12 @@ stdenv.mkDerivation rec { src = ./config-compat.patch; inherit configVersion; }) - (fetchpatch { - name = "glibc-2.25.diff"; - url = "https://cgit.freedesktop.org/fontconfig/patch/?id=1ab5258f7c"; - sha256 = "0x2a4qx51j3gqcp1kp4lisdzmhrkw1zw0r851d82ksgjlc0vkbaz"; - }) ]; - # additionally required for the glibc-2.25 patch; avoid requiring gperf - postPatch = '' - sed s/CHAR_WIDTH/CHARWIDTH/g -i src/fcobjshash.{h,gperf} - sleep 2 - touch src/fcobjshash.h - ''; outputs = [ "bin" "dev" "lib" "out" ]; # $out contains all the config propagatedBuildInputs = [ freetype ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig gperf ]; buildInputs = [ expat ]; configureFlags = [ |