pyrox.dev
lol
meson: 0.60.3 -> 0.61.2
+2
-6
pkgs/development/tools/build-managers/meson/default.nix
+2
-6
pkgs/development/tools/build-managers/meson/default.nix
···
9
9
10
10
python3.pkgs.buildPythonApplication rec {
11
11
pname = "meson";
12
-
version = "0.60.3";
12
+
version = "0.61.2";
13
13
14
14
src = python3.pkgs.fetchPypi {
15
15
inherit pname version;
16
-
hash = "sha256-h8pfqTWKAYZFKTkr1k4CcVjrlK/KfHdmsYZu8n7MuY4=";
16
+
hash = "sha256-AjOn+NlZB5MY9gUrCTnCf2il3oa6YB8lye5oaftfWIk=";
17
17
};
18
18
19
19
patches = [
···
57
57
# unsandboxed non-NixOS builds, see:
58
58
# https://github.com/NixOS/nixpkgs/issues/86131#issuecomment-711051774
59
59
./boost-Do-not-add-system-paths-on-nix.patch
60
-
61
-
# Meson tries to update ld.so.cache which breaks when the target architecture
62
-
# differs from the build host's.
63
-
./do-not-update-ldconfig-cache.patch
64
60
];
65
61
66
62
setupHook = ./setup-hook.sh;
-12
pkgs/development/tools/build-managers/meson/do-not-update-ldconfig-cache.patch
-12
pkgs/development/tools/build-managers/meson/do-not-update-ldconfig-cache.patch
···
1
-
diff --git a/mesonbuild/minstall.py b/mesonbuild/minstall.py
2
-
index cb87faf5c..878ec4cd6 100644
3
-
--- a/mesonbuild/minstall.py
4
-
+++ b/mesonbuild/minstall.py
5
-
@@ -551,7 +551,6 @@ class Installer:
6
-
self.install_emptydir(d, dm, destdir, fullprefix)
7
-
self.install_data(d, dm, destdir, fullprefix)
8
-
self.restore_selinux_contexts(destdir)
9
-
- self.apply_ldconfig(dm, destdir)
10
-
self.run_install_script(d, destdir, fullprefix)
11
-
if not self.did_install_something:
12
-
self.log('Nothing to install.')
+4
-4
pkgs/development/tools/build-managers/meson/fix-rpath.patch
+4
-4
pkgs/development/tools/build-managers/meson/fix-rpath.patch
···
1
1
--- a/mesonbuild/backend/backends.py
2
2
+++ b/mesonbuild/backend/backends.py
3
-
@@ -456,6 +456,21 @@ class Backend:
4
-
args.extend(self.environment.coredata.get_external_link_args(target.for_machine, lang))
5
-
except Exception:
6
-
pass
3
+
@@ -723,6 +723,21 @@
4
+
@staticmethod
5
+
def get_rpath_dirs_from_link_args(args: T.List[str]) -> T.Set[str]:
6
+
dirs: T.Set[str] = set()
7
7
+
8
8
+ nix_ldflags = os.environ.get('NIX_LDFLAGS', '').split()
9
9
+ next_is_path = False