diff options
| author | Dima <dgoldin+github@protonmail.ch> | 2019-11-19 20:55:52 +0100 |
|---|---|---|
| committer | Dima <dgoldin+github@protonmail.ch> | 2019-12-02 02:30:04 +0100 |
| commit | fea6b5f3e0f73fef9e8844e18f8b71300aa32649 (patch) | |
| tree | a79160f7bfd6a1474e034d9f5c97479bb7978dea | |
| parent | 1a33f39d910b943c793e9cb1a76046af83b0b673 (diff) | |
| download | nixlib-fea6b5f3e0f73fef9e8844e18f8b71300aa32649.tar nixlib-fea6b5f3e0f73fef9e8844e18f8b71300aa32649.tar.gz nixlib-fea6b5f3e0f73fef9e8844e18f8b71300aa32649.tar.bz2 nixlib-fea6b5f3e0f73fef9e8844e18f8b71300aa32649.tar.lz nixlib-fea6b5f3e0f73fef9e8844e18f8b71300aa32649.tar.xz nixlib-fea6b5f3e0f73fef9e8844e18f8b71300aa32649.tar.zst nixlib-fea6b5f3e0f73fef9e8844e18f8b71300aa32649.zip | |
cmake: patching for harfbuzz location
a patch to cmake to correctly locate harfbuzz: https://gitlab.kitware.com/cmake/cmake/issues/19531, needed for more recent pango.
| -rw-r--r-- | pkgs/development/tools/build-managers/cmake/default.nix | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index 3cd724b1a311..37a44f15e9ce 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, pkgconfig +{ stdenv, lib, fetchurl, fetchpatch, pkgconfig , bzip2, curl, expat, libarchive, xz, zlib, libuv, rhash , buildPackages # darwin attributes @@ -36,6 +36,13 @@ stdenv.mkDerivation rec { # Derived from https://github.com/libuv/libuv/commit/1a5d4f08238dd532c3718e210078de1186a5920d ./libuv-application-services.patch + + # Fix for harfbuzz with pango versions > 1.43. + # Should be removed with cmake >= 3.16 + (fetchpatch { + url = "https://gitlab.kitware.com/cmake/cmake/commit/effafca77eacbb4988006b1f3f4d9154df6c33f8.diff"; + sha256 = "0vxam5kka1dffygp1nd0g21ib9qk8kds8iprbfga2gimzyrlfmfr"; + }) ] ++ lib.optional stdenv.isCygwin ./3.2.2-cygwin.patch; outputs = [ "out" ]; |