diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2018-05-10 01:40:38 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-05-10 01:40:38 -0400 |
| commit | feb648ce59ffbed94c58133eb7aa2761992a35e1 (patch) | |
| tree | 59d45f1cce7aa4809d9601124bcc9006a80204b7 /pkgs/development/libraries/fontconfig | |
| parent | a02be2bd85b37ed8b257e969d9439357844baa24 (diff) | |
| parent | 70963b382f3f820ba6d3bc3b3aaf50a2957ec1ff (diff) | |
Merge commit '70963b382f3f820ba6d3bc3b3aaf50a2957ec1ff' into lib-platform-simplify
Diffstat (limited to 'pkgs/development/libraries/fontconfig')
| -rw-r--r-- | pkgs/development/libraries/fontconfig/default.nix | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/pkgs/development/libraries/fontconfig/default.nix b/pkgs/development/libraries/fontconfig/default.nix index ce41f1ac7ebc8..a4f6fe007d06d 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,22 +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} - touch src/* - ''; outputs = [ "bin" "dev" "lib" "out" ]; # $out contains all the config propagatedBuildInputs = [ freetype ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig gperf ]; buildInputs = [ expat ]; configureFlags = [ |