From 937e75bef5d2357aefbad48bb142ffbdd4dacdac Mon Sep 17 00:00:00 2001 From: Marco Rebhan Date: Tue, 8 Aug 2023 18:07:54 +0200 Subject: [PATCH] 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(+) diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix index 83320c0bbc41..6ff7fe7f5485 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 = [