mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-01-20 11:53:51 +00:00
meson: 0.52.1 -> 0.53.2
https://mesonbuild.com/Release-notes-for-0-53-0.html https://github.com/mesonbuild/meson/releases/tag/0.53.0 https://github.com/mesonbuild/meson/releases/tag/0.53.1 https://github.com/mesonbuild/meson/releases/tag/0.53.2
This commit is contained in:
parent
205f42b142
commit
65336dc3cf
@ -1,6 +1,5 @@
|
|||||||
{ lib
|
{ lib
|
||||||
, python3Packages
|
, python3Packages
|
||||||
, fetchpatch
|
|
||||||
, stdenv
|
, stdenv
|
||||||
, writeTextDir
|
, writeTextDir
|
||||||
, substituteAll
|
, substituteAll
|
||||||
@ -20,11 +19,11 @@ let
|
|||||||
in
|
in
|
||||||
python3Packages.buildPythonApplication rec {
|
python3Packages.buildPythonApplication rec {
|
||||||
pname = "meson";
|
pname = "meson";
|
||||||
version = "0.52.1";
|
version = "0.53.2";
|
||||||
|
|
||||||
src = python3Packages.fetchPypi {
|
src = python3Packages.fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
sha256 = "02fnrk1fjf3yiix0ak0m9vgbpl4h97fafii5pmw7phmvnlv9fyan";
|
sha256 = "Po+DDzMYQ5fC6wtlHsUCrbY97LKJeL3ISzVY1xKEwh8=";
|
||||||
};
|
};
|
||||||
|
|
||||||
postFixup = ''
|
postFixup = ''
|
||||||
@ -62,14 +61,6 @@ python3Packages.buildPythonApplication rec {
|
|||||||
src = ./fix-rpath.patch;
|
src = ./fix-rpath.patch;
|
||||||
inherit (builtins) storeDir;
|
inherit (builtins) storeDir;
|
||||||
})
|
})
|
||||||
|
|
||||||
# Fix detecting incorrect compiler in the store path hash.
|
|
||||||
# https://github.com/NixOS/nixpkgs/issues/73417#issuecomment-554077964
|
|
||||||
# https://github.com/mesonbuild/meson/pull/6185
|
|
||||||
(fetchpatch {
|
|
||||||
url = "https://github.com/mesonbuild/meson/commit/972ede1d14fdf17fe5bb8fb99be220f9395c2392.patch";
|
|
||||||
sha256 = "19bfsylhpy0b2xv3ks8ac9x3q6vvvyj1wjcy971v9d5f1455xhbb";
|
|
||||||
})
|
|
||||||
];
|
];
|
||||||
|
|
||||||
setupHook = ./setup-hook.sh;
|
setupHook = ./setup-hook.sh;
|
||||||
|
Loading…
Reference in New Issue
Block a user