From c2806a6f94bd97d9d58d05651a49f4eb99e20ba8 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Sat, 12 Jun 2021 22:18:35 +0200 Subject: [PATCH] harfbuzz: 2.8.0 -> 2.8.1 This update removed a redundant fontconfig check from the configure script. --- pkgs/development/libraries/harfbuzz/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix index d4c69ac5d574..9095e4872382 100644 --- a/pkgs/development/libraries/harfbuzz/default.nix +++ b/pkgs/development/libraries/harfbuzz/default.nix @@ -24,7 +24,7 @@ }: let - version = "2.8.0"; + version = "2.8.1"; inherit (lib) optional optionals optionalString; mesonFeatureFlag = opt: b: "-D${opt}=${if b then "enabled" else "disabled"}"; @@ -38,7 +38,7 @@ stdenv.mkDerivation { owner = "harfbuzz"; repo = "harfbuzz"; rev = version; - sha256 = "sha256-JnvOFGK2HWIpzuwgZtyt0IfKfnoXD1LMeVb3RzMmyY4="; + sha256 = "107l9jhvwy6pnq5032kr7r21md65qg09j7iikr4jihf9pvh7gn5w"; }; postPatch = '' @@ -63,6 +63,8 @@ stdenv.mkDerivation { # GUI-related libraries, so it shouldn't be re-added lightly. (mesonFeatureFlag "cairo" false) (mesonFeatureFlag "introspection" isNativeCompilation) + # chafa is only used in a development utility, not in the library + (mesonFeatureFlag "chafa" false) ]; nativeBuildInputs = [ @@ -77,7 +79,7 @@ stdenv.mkDerivation { docbook_xml_dtd_43 ]; - buildInputs = [ glib freetype fontconfig ] + buildInputs = [ glib freetype ] ++ lib.optionals withCoreText [ ApplicationServices CoreText ] ++ lib.optionals isNativeCompilation [ gobject-introspection ];