diff options
| author | Bobby Rong <rjl931189261@126.com> | 2022-06-02 23:34:29 +0800 |
|---|---|---|
| committer | Bobby Rong <rjl931189261@126.com> | 2022-06-02 23:36:54 +0800 |
| commit | 57b107c726ca4d0da44b703f0cb3be14149020f6 (patch) | |
| tree | 1d5ae1b21f4898a3686a1cde57ff2ac3e0b8bc73 | |
| parent | 926444320b7ecdbdef8c0469cce74abc1a79c72b (diff) | |
| download | nixpkgs-57b107c726ca4d0da44b703f0cb3be14149020f6.tar nixpkgs-57b107c726ca4d0da44b703f0cb3be14149020f6.tar.gz nixpkgs-57b107c726ca4d0da44b703f0cb3be14149020f6.tar.bz2 nixpkgs-57b107c726ca4d0da44b703f0cb3be14149020f6.tar.lz nixpkgs-57b107c726ca4d0da44b703f0cb3be14149020f6.tar.xz nixpkgs-57b107c726ca4d0da44b703f0cb3be14149020f6.tar.zst nixpkgs-57b107c726ca4d0da44b703f0cb3be14149020f6.zip | |
gnome.geary: fix build with vala 0.56
| -rw-r--r-- | pkgs/desktops/gnome/misc/geary/default.nix | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/pkgs/desktops/gnome/misc/geary/default.nix b/pkgs/desktops/gnome/misc/geary/default.nix index 37eca7ccc72..db79db65cb1 100644 --- a/pkgs/desktops/gnome/misc/geary/default.nix +++ b/pkgs/desktops/gnome/misc/geary/default.nix @@ -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 |