gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

meson: 1.7.2 -> 1.8.0

Browse Source
This commit is contained in:
Alyssa Ross
2025-05-18 15:39:44 +02:00
parent b71bd0a74d
commit 1cc2b69541
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/by-name/me/meson/007-freebsd-pkgconfig-path.patch
+8 -8
View File
@@ -1,16 +1,16 @@
diff --git a/mesonbuild/modules/pkgconfig.py b/mesonbuild/modules/pkgconfig.py
index 1bdf82931..db165ea12 100644
index cc0450a52..183555c48 100644
--- a/mesonbuild/modules/pkgconfig.py
+++ b/mesonbuild/modules/pkgconfig.py
@@ -701,10 +701,7 @@ class PkgConfigModule(NewExtensionModule):
pcfile = filebase + '.pc'
@@ -702,10 +702,7 @@ class PkgConfigModule(NewExtensionModule):
pkgroot = pkgroot_name = kwargs['install_dir'] or default_install_dir
if pkgroot is None:
- if mesonlib.is_freebsd():
- pkgroot = os.path.join(_as_str(state.environment.coredata.get_option(OptionKey('prefix'))), 'libdata', 'pkgconfig')
m = state.environment.machines.host
- if m.is_freebsd():
- pkgroot = os.path.join(_as_str(state.environment.coredata.optstore.get_value_for(OptionKey('prefix'))), 'libdata', 'pkgconfig')
- pkgroot_name = os.path.join('{prefix}', 'libdata', 'pkgconfig')
- elif mesonlib.is_haiku():
+ if mesonlib.is_haiku():
pkgroot = os.path.join(_as_str(state.environment.coredata.get_option(OptionKey('prefix'))), 'develop', 'lib', 'pkgconfig')
- elif m.is_haiku():
+ if m.is_haiku():
pkgroot = os.path.join(_as_str(state.environment.coredata.optstore.get_value_for(OptionKey('prefix'))), 'develop', 'lib', 'pkgconfig')
pkgroot_name = os.path.join('{prefix}', 'develop', 'lib', 'pkgconfig')
else:
pkgs/by-name/me/meson/package.nix
+2 -2
View File
@@ -16,13 +16,13 @@
python3.pkgs.buildPythonApplication rec {
pname = "meson";
version = "1.7.2";
version = "1.8.0";
src = fetchFromGitHub {
owner = "mesonbuild";
repo = "meson";
tag = version;
hash = "sha256-On67RM3u1/XhdwgtAHve1GAJwKGCnk8IOCjNZcyDfyg=";
hash = "sha256-Y1G3kHSv1krlJjR7oHcN8GavzYj2C25GLq8lvYpnMKA=";
};
patches = [