diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2019-12-03 15:31:39 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-03 15:31:39 +0100 |
| commit | daa676f1d1e946346ab9e414fe507c87298f5d44 (patch) | |
| tree | 3773b1b681a84a101943f917391c180a224c9cd3 /pkgs/development/tools/build-managers | |
| parent | 162a935d3cc91f2b19031e262ef2e639b0fe36dd (diff) | |
| parent | c25d4abc21e7bd50025068156e7dd36ba1ab0b89 (diff) | |
| download | nixlib-daa676f1d1e946346ab9e414fe507c87298f5d44.tar nixlib-daa676f1d1e946346ab9e414fe507c87298f5d44.tar.gz nixlib-daa676f1d1e946346ab9e414fe507c87298f5d44.tar.bz2 nixlib-daa676f1d1e946346ab9e414fe507c87298f5d44.tar.lz nixlib-daa676f1d1e946346ab9e414fe507c87298f5d44.tar.xz nixlib-daa676f1d1e946346ab9e414fe507c87298f5d44.tar.zst nixlib-daa676f1d1e946346ab9e414fe507c87298f5d44.zip | |
Merge pull request #74282 from d-goldin/pango_update_split
pango, pygtk: fixing up newer pango and pygtk
Diffstat (limited to 'pkgs/development/tools/build-managers')
| -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" ]; |