pyrox.dev
meson: 1.7.2 -> 1.8.0
+8
-8
pkgs/by-name/me/meson/007-freebsd-pkgconfig-path.patch
+8
-8
pkgs/by-name/me/meson/007-freebsd-pkgconfig-path.patch
···
1
1
diff --git a/mesonbuild/modules/pkgconfig.py b/mesonbuild/modules/pkgconfig.py
2
-
index 1bdf82931..db165ea12 100644
2
+
index cc0450a52..183555c48 100644
3
3
--- a/mesonbuild/modules/pkgconfig.py
4
4
+++ b/mesonbuild/modules/pkgconfig.py
5
-
@@ -701,10 +701,7 @@ class PkgConfigModule(NewExtensionModule):
6
-
pcfile = filebase + '.pc'
5
+
@@ -702,10 +702,7 @@ class PkgConfigModule(NewExtensionModule):
7
6
pkgroot = pkgroot_name = kwargs['install_dir'] or default_install_dir
8
7
if pkgroot is None:
9
-
- if mesonlib.is_freebsd():
10
-
- pkgroot = os.path.join(_as_str(state.environment.coredata.get_option(OptionKey('prefix'))), 'libdata', 'pkgconfig')
8
+
m = state.environment.machines.host
9
+
- if m.is_freebsd():
10
+
- pkgroot = os.path.join(_as_str(state.environment.coredata.optstore.get_value_for(OptionKey('prefix'))), 'libdata', 'pkgconfig')
11
11
- pkgroot_name = os.path.join('{prefix}', 'libdata', 'pkgconfig')
12
-
- elif mesonlib.is_haiku():
13
-
+ if mesonlib.is_haiku():
14
-
pkgroot = os.path.join(_as_str(state.environment.coredata.get_option(OptionKey('prefix'))), 'develop', 'lib', 'pkgconfig')
12
+
- elif m.is_haiku():
13
+
+ if m.is_haiku():
14
+
pkgroot = os.path.join(_as_str(state.environment.coredata.optstore.get_value_for(OptionKey('prefix'))), 'develop', 'lib', 'pkgconfig')
15
15
pkgroot_name = os.path.join('{prefix}', 'develop', 'lib', 'pkgconfig')
16
16
else:
+2
-2
pkgs/by-name/me/meson/package.nix
+2
-2
pkgs/by-name/me/meson/package.nix
···
16
16
17
17
python3.pkgs.buildPythonApplication rec {
18
18
pname = "meson";
19
-
version = "1.7.2";
19
+
version = "1.8.0";
20
20
21
21
src = fetchFromGitHub {
22
22
owner = "mesonbuild";
23
23
repo = "meson";
24
24
tag = version;
25
-
hash = "sha256-On67RM3u1/XhdwgtAHve1GAJwKGCnk8IOCjNZcyDfyg=";
25
+
hash = "sha256-Y1G3kHSv1krlJjR7oHcN8GavzYj2C25GLq8lvYpnMKA=";
26
26
};
27
27
28
28
patches = [