about summary refs log tree commit diff
path: root/pkgs/development/libraries/harfbuzz
diff options
context:
space:
mode:
authorR. Ryantm <ryantm-bot@ryantm.com>2022-10-23 16:59:00 +0000
committersternenseemann <sternenseemann@systemli.org>2022-11-12 16:54:41 +0100
commitb40e6283a748cdee21e9cbae45be94fe66451709 (patch)
treeb6bb5207c78cf2f075e7f7433efba37f0506f669 /pkgs/development/libraries/harfbuzz
parent16bc3796c67dc73f0c44ba129f90fb59fd1b4a82 (diff)
harfbuzz: 5.2.0 -> 5.3.1
Co-Authored-By: sternenseemann <sternenseemann@systemli.org>
Diffstat (limited to 'pkgs/development/libraries/harfbuzz')
-rw-r--r--pkgs/development/libraries/harfbuzz/default.nix15
1 files changed, 13 insertions, 2 deletions
diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix
index 0bb6546543dc0..13f73a7ac1af6 100644
--- a/pkgs/development/libraries/harfbuzz/default.nix
+++ b/pkgs/development/libraries/harfbuzz/default.nix
@@ -1,6 +1,7 @@
 { lib
 , stdenv
 , fetchurl
+, fetchpatch
 , pkg-config
 , glib
 , freetype
@@ -30,7 +31,7 @@
 }:
 
 let
-  version = "5.2.0";
+  version = "5.3.1";
   inherit (lib) optional optionals optionalString;
   mesonFeatureFlag = opt: b:
     "-D${opt}=${if b then "enabled" else "disabled"}";
@@ -42,9 +43,19 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "https://github.com/harfbuzz/harfbuzz/releases/download/${version}/harfbuzz-${version}.tar.xz";
-    sha256 = "0b4lpkidwx0lf8slczjji652yll6g5zgmm5lmisnb4s7gf8r8nkk";
+    sha256 = "sha256-Smzgl7dagSH6zEuoO1sIO/7GV/RbADzVo0JPKua0Q00=";
   };
 
+  patches = [
+    # Pick upstream patch for exported symbol test failing on darwin
+    # https://github.com/harfbuzz/harfbuzz/issues/3850
+    (fetchpatch {
+      name = "harfbuzz-fix-check-symbol-tests-lto-and-darwin.patch";
+      url = "https://github.com/harfbuzz/harfbuzz/commit/b0b7a65388da25ae3fa01e969ad6abc67eed4f49.patch";
+      sha256 = "0my064r88pikw6q70hbgf6hwfkw544b9f5ai73qhn2a3c83jqn06";
+    })
+  ];
+
   postPatch = ''
     patchShebangs src/*.py test
   '' + lib.optionalString stdenv.isDarwin ''