From 1cc2b695415fc1c64bee65e30ab8282c765f13b0 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Tue, 29 Apr 2025 09:15:23 +0200
Subject: [PATCH] meson: 1.7.2 -> 1.8.0

---
 .../me/meson/007-freebsd-pkgconfig-path.patch    | 16 ++++++++--------
 pkgs/by-name/me/meson/package.nix                |  4 ++--
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/me/meson/007-freebsd-pkgconfig-path.patch b/pkgs/by-name/me/meson/007-freebsd-pkgconfig-path.patch
index 8eb172bb1256..a18f4daec430 100644
--- a/pkgs/by-name/me/meson/007-freebsd-pkgconfig-path.patch
+++ b/pkgs/by-name/me/meson/007-freebsd-pkgconfig-path.patch
@@ -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:
diff --git a/pkgs/by-name/me/meson/package.nix b/pkgs/by-name/me/meson/package.nix
index 9ac84af31d3d..87676a568e6e 100644
--- a/pkgs/by-name/me/meson/package.nix
+++ b/pkgs/by-name/me/meson/package.nix
@@ -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 = [