dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Revert "meson: 0.52.1 -> 0.53.2"

Browse Source 
This reverts commit d607564d68.

should go to staging
This commit is contained in:
Jan Tojnar 2020-02-28 11:09:24 +01:00
parent 0535597ca8
commit ca55015ed8
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/development/tools/build-managers/meson/default.nix
View File

@ -1,5 +1,6 @@
{ lib { lib
, python3Packages , python3Packages
, fetchpatch
, stdenv , stdenv
, writeTextDir , writeTextDir
, substituteAll , substituteAll
@ -19,11 +20,11 @@ let
in in
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "meson"; pname = "meson";
version = "0.53.2"; version = "0.52.1";
src = python3Packages.fetchPypi { src = python3Packages.fetchPypi {
inherit pname version; inherit pname version;
sha256 = "Po+DDzMYQ5fC6wtlHsUCrbY97LKJeL3ISzVY1xKEwh8="; sha256 = "02fnrk1fjf3yiix0ak0m9vgbpl4h97fafii5pmw7phmvnlv9fyan";
}; };
postFixup = '' postFixup = ''
@ -61,6 +62,14 @@ 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;