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 3a9ba6f092dda..8eb172bb12563 100644 --- a/pkgs/by-name/me/meson/007-freebsd-pkgconfig-path.patch +++ b/pkgs/by-name/me/meson/007-freebsd-pkgconfig-path.patch @@ -1,15 +1,16 @@ -diff -ur a/mesonbuild/modules/pkgconfig.py b/mesonbuild/modules/pkgconfig.py ---- a/mesonbuild/modules/pkgconfig.py 2024-05-17 17:52:30.880877000 -0700 -+++ b/mesonbuild/modules/pkgconfig.py 2024-05-17 17:53:10.901068000 -0700 -@@ -693,10 +693,7 @@ +diff --git a/mesonbuild/modules/pkgconfig.py b/mesonbuild/modules/pkgconfig.py +index 1bdf82931..db165ea12 100644 +--- a/mesonbuild/modules/pkgconfig.py ++++ b/mesonbuild/modules/pkgconfig.py +@@ -701,10 +701,7 @@ class PkgConfigModule(NewExtensionModule): pcfile = filebase + '.pc' 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(mesonlib.OptionKey('prefix'))), 'libdata', 'pkgconfig') +- pkgroot = os.path.join(_as_str(state.environment.coredata.get_option(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(mesonlib.OptionKey('prefix'))), 'develop', 'lib', 'pkgconfig') + pkgroot = os.path.join(_as_str(state.environment.coredata.get_option(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 d463190fec080..419e489e2b2e1 100644 --- a/pkgs/by-name/me/meson/package.nix +++ b/pkgs/by-name/me/meson/package.nix @@ -13,7 +13,6 @@ , python3 , substituteAll , zlib -, fetchpatch }: let @@ -21,13 +20,13 @@ let in python3.pkgs.buildPythonApplication rec { pname = "meson"; - version = "1.5.2"; + version = "1.6.0"; src = fetchFromGitHub { owner = "mesonbuild"; repo = "meson"; rev = "refs/tags/${version}"; - hash = "sha256-cesMepnD3fHX2CwnSQ3c5TE9kPSa0FkCVVVZDgXwo8M="; + hash = "sha256-st0dbb+GfF0KEyF+Qn/PIE2462ZrrXy8YcnrulHTI8M="; }; patches = [ @@ -74,24 +73,6 @@ python3.pkgs.buildPythonApplication rec { # This edge case is explicitly part of meson but is wrong for nix ./007-freebsd-pkgconfig-path.patch - - (fetchpatch { - name = "tests-skip-framework-recasting-if-CMake-unavailable.patch"; - url = "https://github.com/mesonbuild/meson/commit/8a8a3a0578fd8d5a8720a7a706f6f3b99e857f9c.patch"; - hash = "sha256-XkwNQ5eg/fVekhsFg/V2/S2LbIVGz3H0wsSFlUT3ZZE="; - }) - - # Fix extraframework lookup on case-sensitive APFS. - # https://github.com/mesonbuild/meson/pull/13038 - ./007-case-sensitive-fs.patch - - # Fix meson's detection for zig's linker - # https://github.com/mesonbuild/meson/pull/12293 - (fetchpatch { - name = "linker-support-zig-cc.patch"; - url = "https://github.com/mesonbuild/meson/pull/12293/commits/2baae244c995794d9addfe6ed924dfa72f01be82.patch"; - hash = "sha256-dDOmSRBKl/gs7I3kmLXIyQk3zsOdlaYov72pPSel4+I="; - }) ]; buildInputs = lib.optionals (python3.pythonOlder "3.9") [ @@ -129,7 +110,7 @@ python3.pkgs.buildPythonApplication rec { patchShebangs 'test cases' substituteInPlace \ 'test cases/native/8 external program shebang parsing/script.int.in' \ - 'test cases/common/273 customtarget exe for test/generate.py' \ + 'test cases/common/274 customtarget exe for test/generate.py' \ --replace /usr/bin/env ${coreutils}/bin/env '' ]