meson: 0.51.2 → 0.52.1
https://mesonbuild.com/Release-notes-for-0-52-0.html https://github.com/mesonbuild/meson/compare/0.52.0...0.52.1
This commit is contained in:
@@ -19,11 +19,11 @@ let
|
||||
in
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "meson";
|
||||
version = "0.51.2";
|
||||
version = "0.52.1";
|
||||
|
||||
src = python3Packages.fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0cqhkjbab1mbvxmbjvyfrbjfkm7bh436svqpjapca36c2k9h1vwr";
|
||||
sha256 = "02fnrk1fjf3yiix0ak0m9vgbpl4h97fafii5pmw7phmvnlv9fyan";
|
||||
};
|
||||
|
||||
postFixup = ''
|
||||
@@ -69,23 +69,6 @@ python3Packages.buildPythonApplication rec {
|
||||
url = "https://github.com/mesonbuild/meson/commit/972ede1d14fdf17fe5bb8fb99be220f9395c2392.patch";
|
||||
sha256 = "19bfsylhpy0b2xv3ks8ac9x3q6vvvyj1wjcy971v9d5f1455xhbb";
|
||||
})
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
# We use custom Clang, which makes Meson think *not Apple*, while still
|
||||
# relying on system linker. When it detects standard Clang, Meson will
|
||||
# pass it `-Wl,-O1` flag but optimizations are not recognized by
|
||||
# Mac linker.
|
||||
# https://github.com/mesonbuild/meson/issues/4784
|
||||
# Should be fixed in 0.52
|
||||
./fix-objc-linking.patch
|
||||
|
||||
# Fixes error finding some frameworks
|
||||
# https://github.com/NixOS/nixpkgs/pull/70690#issuecomment-553704175
|
||||
# https://github.com/mesonbuild/meson/pull/5980
|
||||
# Should be fixed in 0.52
|
||||
(fetchpatch {
|
||||
url = "https://github.com/mesonbuild/meson/commit/8d3fcb3dc4d7204a4646807f8b5191d79fb291e5.patch";
|
||||
sha256 = "0g95gl662mribnnz5jcyn1jaaw8w7r1vgbg2jbm91dcrr5zji5ng";
|
||||
})
|
||||
];
|
||||
|
||||
setupHook = ./setup-hook.sh;
|
||||
|
||||
Reference in New Issue
Block a user