From cd8418e3fde94d3c59a52fcdd83866d69b4f4d29 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 19 Nov 2023 18:33:18 +0000
Subject: harfbuzz: 7.3.0 -> 8.3.0

---
 pkgs/development/libraries/harfbuzz/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/development/libraries/harfbuzz')

diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix
index 88f373dd4afad..c05d46de7b135 100644
--- a/pkgs/development/libraries/harfbuzz/default.nix
+++ b/pkgs/development/libraries/harfbuzz/default.nix
@@ -35,11 +35,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "harfbuzz${lib.optionalString withIcu "-icu"}";
-  version = "7.3.0";
+  version = "8.3.0";
 
   src = fetchurl {
     url = "https://github.com/harfbuzz/harfbuzz/releases/download/${finalAttrs.version}/harfbuzz-${finalAttrs.version}.tar.xz";
-    hash = "sha256-IHcHiXSaybqEbfM5g9vaItuDbHDZ9dBQy5qlNHCUqPs=";
+    hash = "sha256-EJUB6uuL3j6tsl+rQWTpk/us4pw9d1vKocHlji8V+Ec=";
   };
 
   postPatch = ''
-- 
cgit 1.4.1


From c6eea93ac534740d14101deec2e3a07a3edc6434 Mon Sep 17 00:00:00 2001
From: Marco Rebhan <me@dblsaiko.net>
Date: Tue, 8 Aug 2023 18:07:50 +0200
Subject: harfbuzz: remove unused args

---
 pkgs/development/libraries/harfbuzz/default.nix | 2 --
 1 file changed, 2 deletions(-)

(limited to 'pkgs/development/libraries/harfbuzz')

diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix
index c05d46de7b135..83320c0bbc41b 100644
--- a/pkgs/development/libraries/harfbuzz/default.nix
+++ b/pkgs/development/libraries/harfbuzz/default.nix
@@ -1,11 +1,9 @@
 { lib
 , stdenv
 , fetchurl
-, fetchpatch
 , pkg-config
 , glib
 , freetype
-, fontconfig
 , libintl
 , meson
 , ninja
-- 
cgit 1.4.1


From 937e75bef5d2357aefbad48bb142ffbdd4dacdac Mon Sep 17 00:00:00 2001
From: Marco Rebhan <me@dblsaiko.net>
Date: Tue, 8 Aug 2023 18:07:54 +0200
Subject: harfbuzz: add flag to correctly install CMake files

Similar to how we already set -DKDE_INSTALL_CMAKEPACKAGEDIR in CMake
builds, Harfbuzz now uses -Dcmakepackagedir to correctly handle both
Nixpkgs split outputs and relocatable installations.

See https://github.com/harfbuzz/harfbuzz/pull/4370.
---
 pkgs/development/libraries/harfbuzz/default.nix | 1 +
 1 file changed, 1 insertion(+)

(limited to 'pkgs/development/libraries/harfbuzz')

diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix
index 83320c0bbc41b..6ff7fe7f54858 100644
--- a/pkgs/development/libraries/harfbuzz/default.nix
+++ b/pkgs/development/libraries/harfbuzz/default.nix
@@ -63,6 +63,7 @@ stdenv.mkDerivation (finalAttrs: {
     (lib.mesonEnable "graphite" withGraphite2)
     (lib.mesonEnable "icu" withIcu)
     (lib.mesonEnable "introspection" withIntrospection)
+    (lib.mesonOption "cmakepackagedir" "${placeholder "dev"}/lib/cmake")
   ];
 
   depsBuildBuild = [
-- 
cgit 1.4.1