Skip to content

meson: 0.60.3 -> 0.61.2 #154833

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

Merged
AndersonTorres merged 1 commit into from
Mar 14, 2022
Merged

meson: 0.60.3 -> 0.61.2 #154833

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
8 changes: 2 additions & 6 deletions pkgs/development/tools/build-managers/meson/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@

python3.pkgs.buildPythonApplication rec {
pname = "meson";
version = "0.60.3";
version = "0.61.2";

src = python3.pkgs.fetchPypi {
inherit pname version;
hash = "sha256-h8pfqTWKAYZFKTkr1k4CcVjrlK/KfHdmsYZu8n7MuY4=";
hash = "sha256-AjOn+NlZB5MY9gUrCTnCf2il3oa6YB8lye5oaftfWIk=";
};

patches = [
Expand Down Expand Up @@ -57,10 +57,6 @@ python3.pkgs.buildPythonApplication rec {
# unsandboxed non-NixOS builds, see:
# https://github.com/NixOS/nixpkgs/issues/86131#issuecomment-711051774
./boost-Do-not-add-system-paths-on-nix.patch

# Meson tries to update ld.so.cache which breaks when the target architecture
# differs from the build host's.
./do-not-update-ldconfig-cache.patch
];

setupHook = ./setup-hook.sh;
Expand Down
12 changes: 0 additions & 12 deletions pkgs/development/tools/build-managers/meson/do-not-update-ldconfig-cache.patch
View file
Open in desktop

This file was deleted.

8 changes: 4 additions & 4 deletions pkgs/development/tools/build-managers/meson/fix-rpath.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
--- a/mesonbuild/backend/backends.py
+++ b/mesonbuild/backend/backends.py
@@ -456,6 +456,21 @@ class Backend:
args.extend(self.environment.coredata.get_external_link_args(target.for_machine, lang))
except Exception:
pass
@@ -723,6 +723,21 @@
@staticmethod
def get_rpath_dirs_from_link_args(args: T.List[str]) -> T.Set[str]:
dirs: T.Set[str] = set()
+
+ nix_ldflags = os.environ.get('NIX_LDFLAGS', '').split()
+ next_is_path = False
Expand Down