From 343caa6c47b554fdb802d4bda759c97528afa169 Mon Sep 17 00:00:00 2001 From: Artturin Date: Fri, 31 May 2024 00:29:50 +0300 Subject: [PATCH] meson: add patch to find boost via pkg-config --- pkgs/by-name/me/meson/package.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/by-name/me/meson/package.nix b/pkgs/by-name/me/meson/package.nix index 6b685d292f8b..cb5093c2caf4 100644 --- a/pkgs/by-name/me/meson/package.nix +++ b/pkgs/by-name/me/meson/package.nix @@ -13,6 +13,7 @@ , python3 , substituteAll , zlib +, fetchpatch }: let @@ -70,6 +71,16 @@ python3.pkgs.buildPythonApplication rec { # This edge case is explicitly part of meson but is wrong for nix ./007-freebsd-pkgconfig-path.patch + + # Find boost via pkg-config + # https://github.com/NixOS/nixpkgs/issues/86131 + # Already merged upstream PR: https://github.com/mesonbuild/meson/pull/13272 + # FIXME: Will be in meson 1.5.0 + (fetchpatch { + name = "find-boost-pkg-config.patch"; + url = "https://github.com/mesonbuild/meson/commit/c21b886ba8a60cce7fa56e4be40bd7547129fb00.patch"; + hash = "sha256-uSilNuSx9yd1cxs0XVLcLw4MOXEd2uIe2g+wk+SBqeU="; + }) ]; buildInputs = lib.optionals (python3.pythonOlder "3.9") [