Merge pull request #175957 from bobby285271/geary

gnome.geary: fix build with vala 0.56
This commit is contained in:
Bobby Rong 2022-06-03 00:28:25 +08:00 committed by GitHub
commit 6916de88bd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1,6 +1,7 @@
{ lib
, stdenv
, fetchurl
, fetchpatch
, pkg-config
, gtk3
, vala
@ -54,6 +55,21 @@ stdenv.mkDerivation rec {
sha256 = "1c2nd35500ng28223y5pszc7fh8g16njj34f6p5xc9594lvj0mik";
};
patches = [
# Fix accessibility issues with initializer of constants (Fix build with vala 0.56)
# https://gitlab.gnome.org/GNOME/geary/-/merge_requests/720
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/geary/-/commit/9bd4c82952a0a2c3308c5cc86c0b85650c1fb484.patch";
sha256 = "sha256-mSms0MOfw8xHxOrEQwrIv+d4h01xLPgyvX2oWmmFQVw=";
})
# Util.Cache.Lru: Workaround missing generic type argument (Fix build with vala 0.56)
# https://gitlab.gnome.org/GNOME/geary/-/merge_requests/721
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/geary/-/commit/0f75e7a84a39492d0748cec2ba6028e08cae3644.patch";
sha256 = "sha256-1ADQqKm3DxtjDGPSThq3c7s5S+q/3u/qr9JQEsLaFMI=";
})
];
nativeBuildInputs = [
appstream-glib
desktop-file-utils