Merge pull request #164948 from trofi/fix-meld-for-meson-0.60

meld: pull upstream fix for meson-0.60
This commit is contained in:
Anderson Torres 2022-03-20 15:17:43 -03:00 committed by GitHub
commit 7e1810ceb2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1,5 +1,6 @@
{ lib
, fetchurl
, fetchpatch
, gettext
, itstool
, python3
@ -27,6 +28,16 @@ python3.pkgs.buildPythonApplication rec {
sha256 = "cP6Y65Ms4h1nFw47D2pzF+gT6GLemJM+pROYLpoDMgI=";
};
patches = [
# Pull upstream fix for meson-0.60:
# https://gitlab.gnome.org/GNOME/meld/-/merge_requests/78
(fetchpatch {
name = "meson-0.60.patch";
url = "https://gitlab.gnome.org/GNOME/meld/-/commit/cc7746c141d976a4779cf868774fae1fe7627a6d.patch";
sha256 = "sha256-4uJZyF00Z6svzrOebByZV1hutCZRkIQYC4rUxQr5fdQ=";
})
];
nativeBuildInputs = [
meson
ninja