cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

cmake: patching for harfbuzz location

Browse source 
a patch to cmake to correctly locate harfbuzz:
https://gitlab.kitware.com/cmake/cmake/issues/19531,
needed for more recent pango.
This commit is contained in:
Dima 2019-11-19 20:55:52 +01:00
parent 1a33f39d91
commit fea6b5f3e0
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
pkgs/development/tools/build-managers/cmake/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, lib, fetchurl, pkgconfig { stdenv, lib, fetchurl, fetchpatch, pkgconfig
, bzip2, curl, expat, libarchive, xz, zlib, libuv, rhash , bzip2, curl, expat, libarchive, xz, zlib, libuv, rhash
, buildPackages , buildPackages
# darwin attributes # darwin attributes
@ -36,6 +36,13 @@ stdenv.mkDerivation rec {
# Derived from https://github.com/libuv/libuv/commit/1a5d4f08238dd532c3718e210078de1186a5920d # Derived from https://github.com/libuv/libuv/commit/1a5d4f08238dd532c3718e210078de1186a5920d
./libuv-application-services.patch ./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; ] ++ lib.optional stdenv.isCygwin ./3.2.2-cygwin.patch;
outputs = [ "out" ]; outputs = [ "out" ];