From 5f97fe5f306192f9febfad820632c44e0c25493e Mon Sep 17 00:00:00 2001 From: Kira Bruneau Date: Sun, 7 Feb 2021 23:00:15 -0500 Subject: [PATCH] harfbuzz: fix cross compilation This change indirectly fixes cross compilation for Emacs Fixes build errors: - src/meson.build:639:4: ERROR: Problem encountered: Introspection support is requested but it isn't available in cross builds - Program glib-mkenums mkenums found: NO --- pkgs/development/libraries/harfbuzz/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix index b3615893b5329..6897469790db0 100644 --- a/pkgs/development/libraries/harfbuzz/default.nix +++ b/pkgs/development/libraries/harfbuzz/default.nix @@ -15,6 +15,7 @@ let inherit (lib) optional optionals optionalString; mesonFeatureFlag = opt: b: "-D${opt}=${if b then "enabled" else "disabled"}"; + isCross = stdenv.hostPlatform != stdenv.buildPlatform; in stdenv.mkDerivation { @@ -43,21 +44,25 @@ stdenv.mkDerivation { (mesonFeatureFlag "graphite" withGraphite2) (mesonFeatureFlag "icu" withIcu) (mesonFeatureFlag "coretext" withCoreText) + (mesonFeatureFlag "introspection" (!isCross)) ]; + strictDeps = true; + nativeBuildInputs = [ meson ninja - gobject-introspection libintl pkg-config python3 gtk-doc docbook-xsl-nons docbook_xml_dtd_43 - ]; + glib # glib-mkenums + ] ++ lib.optional (!isCross) gobject-introspection; buildInputs = [ glib freetype cairo ] # recommended by upstream + ++ lib.optional (!isCross) gobject-introspection ++ lib.optionals withCoreText [ ApplicationServices CoreText ]; propagatedBuildInputs = []