depot/third_party/nixpkgs/pkgs/by-name/me/meson/005-boost-Do-not-add-system-paths-on-nix.patch

27 lines
1,003 B
Diff
Raw Normal View History

diff --git a/mesonbuild/dependencies/boost.py b/mesonbuild/dependencies/boost.py
index 11cf0beca..80f950866 100644
--- a/mesonbuild/dependencies/boost.py
+++ b/mesonbuild/dependencies/boost.py
@@ -687,20 +687,7 @@ class BoostDependency(SystemDependency):
else:
tmp: T.List[Path] = []
- # Add some default system paths
- if m.is_darwin():
- tmp.extend([
- Path('/opt/homebrew/'), # for Apple Silicon MacOS
- Path('/usr/local/opt/boost'), # for Intel Silicon MacOS
- ])
- tmp += [Path('/opt/local')]
- tmp += [Path('/usr/local')]
- tmp += [Path('/usr')]
-
- # Cleanup paths
- tmp = [x for x in tmp if x.is_dir()]
- tmp = [x.resolve() for x in tmp]
- roots += tmp
+ # Remove such spurious, non-explicit "system" paths for Nix&Nixpkgs
self.check_and_set_roots(roots, use_system=True)