From e91229bf25f2c21ca0daa5adfe859b211739d475 Mon Sep 17 00:00:00 2001 From: Rick van Schijndel Date: Thu, 14 Apr 2022 20:56:22 +0200 Subject: [PATCH] meson: apply patch fixing exception during cross-compilation Fixes a traceback where you get the following error: - AttributeError: 'NoneType' object has no attribute 'get_command' This happened when cross-compiling e.g. harfbuzz. --- pkgs/development/tools/build-managers/meson/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/default.nix index d8c92bc82d6e..f62bb22314de 100644 --- a/pkgs/development/tools/build-managers/meson/default.nix +++ b/pkgs/development/tools/build-managers/meson/default.nix @@ -58,6 +58,13 @@ python3.pkgs.buildPythonApplication rec { # unsandboxed non-NixOS builds, see: # https://github.com/NixOS/nixpkgs/issues/86131#issuecomment-711051774 ./boost-Do-not-add-system-paths-on-nix.patch + + # https://github.com/mesonbuild/meson/pull/9841 + # cross-compilation fix + (fetchpatch { + url = "https://github.com/mesonbuild/meson/commit/266e8acb5807b38a550cb5145cea0e19545a21d7.patch"; + sha256 = "sha256-1GdKsm2xvq2GxTNeTyBH5O73hxboL0YI+w2BCoUeWXM="; + }) ] ++ lib.optionals withDarwinFrameworksGtkDocPatch [ # Fix building gtkdoc for GLib # https://github.com/mesonbuild/meson/pull/10186