mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-28 18:03:04 +00:00
meson: add patch to find boost via pkg-config
This commit is contained in:
parent
c087a46e7b
commit
343caa6c47
@ -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") [
|
||||
|
Loading…
Reference in New Issue
Block a user