646b892680
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s
27 lines
1003 B
Diff
27 lines
1003 B
Diff
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)
|
|
|