Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

meson: 1.4.0 -> 1.4.1 #316178

Merged
merged 1 commit into from
Jun 27, 2024
Merged

meson: 1.4.0 -> 1.4.1 #316178

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 11 additions & 6 deletions pkgs/by-name/me/meson/005-boost-Do-not-add-system-paths-on-nix.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,18 @@
diff -Naur meson-0.60.2-old/mesonbuild/dependencies/boost.py meson-0.60.2-new/mesonbuild/dependencies/boost.py
--- meson-0.60.2-old/mesonbuild/dependencies/boost.py 2021-11-02 16:58:07.000000000 -0300
+++ meson-0.60.2-new/mesonbuild/dependencies/boost.py 2021-12-12 19:21:27.895705897 -0300
@@ -682,16 +682,7 @@
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 = [] # type: T.List[Path]
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/opt/boost')]
- tmp += [Path('/usr/local')]
- tmp += [Path('/usr')]
-
Expand Down
190 changes: 0 additions & 190 deletions pkgs/by-name/me/meson/007-Allow-building-via-ninja-12.patch
View file
Open in desktop

This file was deleted.

12 changes: 2 additions & 10 deletions pkgs/by-name/me/meson/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@ let
in
python3.pkgs.buildPythonApplication rec {
pname = "meson";
version = "1.4.0";
version = "1.4.1";

src = fetchFromGitHub {
owner = "mesonbuild";
repo = "meson";
rev = "refs/tags/${version}";
hash = "sha256-hRTmKO2E6SIdvAhO7OJtV8dcsGm39c51H+2ZGEkdcFY=";
hash = "sha256-RBE4AUF5fymUA87JEDWtpUFXmVPFzdhZgDI7/kscTx4=";
};

patches = [
Expand Down Expand Up @@ -68,14 +68,6 @@ python3.pkgs.buildPythonApplication rec {

# This edge case is explicitly part of meson but is wrong for nix
./007-freebsd-pkgconfig-path.patch

# Fix cross-compilation of proc-macro (and mesa)
# https://github.com/mesonbuild/meson/issues/12973
./0001-Revert-rust-recursively-pull-proc-macro-dependencies.patch

# Fix compilation of Meson using Ninja 1.12
# FIXME: remove in the next point release
./007-Allow-building-via-ninja-12.patch
];

buildInputs = lib.optionals (python3.pythonOlder "3.9") [
Expand Down