Skip to content

Commit

Permalink
meson: apply patch fixing exception during cross-compilation
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
Mindavi committed Apr 19, 2022
1 parent 02fe739 commit e91229b
Showing 1 changed file with 7 additions and 0 deletions.
7 changes: 7 additions & 0 deletions pkgs/development/tools/build-managers/meson/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit e91229b

Please sign in to comment.