nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-29 02:13:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

meson: add patch to find boost via pkg-config

Browse Source
This commit is contained in:
Artturin 2024-05-31 00:29:50 +03:00 committed by Alyssa Ross
parent c087a46e7b
commit 343caa6c47
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/by-name/me/meson/package.nix
View File

@ -13,6 +13,7 @@
, python3 , python3
, substituteAll , substituteAll
, zlib , zlib
, fetchpatch
}: }:
let let
@ -70,6 +71,16 @@ python3.pkgs.buildPythonApplication rec {
# This edge case is explicitly part of meson but is wrong for nix # This edge case is explicitly part of meson but is wrong for nix
./007-freebsd-pkgconfig-path.patch ./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") [ buildInputs = lib.optionals (python3.pythonOlder "3.9") [