pyrox.dev
Merge pull request #326187 from alyssais/meson-1.5.0
meson: 1.4.1 -> 1.5.0
authored by Masum Reza and committed by GitHub 382bb7c0 38b5a205
+14
-9
pkgs/by-name/me/meson/package.nix
+14
-9
pkgs/by-name/me/meson/package.nix
···
21
21
in
22
22
python3.pkgs.buildPythonApplication rec {
23
23
pname = "meson";
24
-
version = "1.4.1";
24
+
version = "1.5.0";
25
25
26
26
src = fetchFromGitHub {
27
27
owner = "mesonbuild";
28
28
repo = "meson";
29
29
rev = "refs/tags/${version}";
30
-
hash = "sha256-RBE4AUF5fymUA87JEDWtpUFXmVPFzdhZgDI7/kscTx4=";
30
+
hash = "sha256-Y//8fXBNdx+ikpvg+S5Bk2rN3UVS5qo2bnbTSVBb8b8=";
31
31
};
32
32
33
33
patches = [
···
72
72
# This edge case is explicitly part of meson but is wrong for nix
73
73
./007-freebsd-pkgconfig-path.patch
74
74
75
-
# Find boost via pkg-config
76
-
# https://github.com/NixOS/nixpkgs/issues/86131
77
-
# Already merged upstream PR: https://github.com/mesonbuild/meson/pull/13272
78
-
# FIXME: Will be in meson 1.5.0
75
+
(fetchpatch {
76
+
name = "tests-skip-framework-recasting-if-CMake-unavailable.patch";
77
+
url = "https://github.com/mesonbuild/meson/commit/8a8a3a0578fd8d5a8720a7a706f6f3b99e857f9c.patch";
78
+
hash = "sha256-XkwNQ5eg/fVekhsFg/V2/S2LbIVGz3H0wsSFlUT3ZZE=";
79
+
})
80
+
79
81
(fetchpatch {
80
-
name = "find-boost-pkg-config.patch";
81
-
url = "https://github.com/mesonbuild/meson/commit/c21b886ba8a60cce7fa56e4be40bd7547129fb00.patch";
82
-
hash = "sha256-uSilNuSx9yd1cxs0XVLcLw4MOXEd2uIe2g+wk+SBqeU=";
82
+
name = "cross.patch";
83
+
url = "https://github.com/mesonbuild/meson/pull/13411.patch";
84
+
hash = "sha256-IHSV0Dfse0lzDtxh/+APc/dzGr/BUbR/WIOqDsm7/8Y=";
83
85
})
84
86
];
85
87
···
133
135
''test cases/linuxlike/14 static dynamic linkage''
134
136
# Nixpkgs cctools does not have bitcode support.
135
137
''test cases/osx/7 bitcode''
138
+
] ++ lib.optionals stdenv.isDarwin [
139
+
# requires llvmPackages.openmp, creating cyclic dependency
140
+
''test cases/common/184 openmp''
136
141
] ++ lib.optionals stdenv.isFreeBSD [
137
142
# pch doesn't work quite right on FreeBSD, I think
138
143
''test cases/common/13 pch''