diff options
| author | Bobby Rong <rjl931189261@126.com> | 2022-09-21 10:16:16 +0800 |
|---|---|---|
| committer | Bobby Rong <rjl931189261@126.com> | 2022-09-23 20:48:27 +0800 |
| commit | ccc13863172990d1d07a88341ac9c8241aa95af5 (patch) | |
| tree | 620a4ca5aa83fa487f2a96d2aebdc3fabdc0272a | |
| parent | pantheon.switchboard-plug-onlineaccounts: Fix build with evolution-data-serve... (diff) | |
| download | nixpkgs-ccc13863172990d1d07a88341ac9c8241aa95af5.tar.gz | |
pantheon.elementary-mail: Fix build with evolution-data-server 3.46
| -rw-r--r-- | pkgs/desktops/pantheon/apps/elementary-mail/default.nix | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/pkgs/desktops/pantheon/apps/elementary-mail/default.nix b/pkgs/desktops/pantheon/apps/elementary-mail/default.nix index 1dc000f66adf..879f1f8bd919 100644 --- a/pkgs/desktops/pantheon/apps/elementary-mail/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-mail/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , nix-update-script , pkg-config , meson @@ -10,10 +11,8 @@ , gtk3 , libxml2 , libhandy -, webkitgtk +, webkitgtk_4_1 , folks -, libgdata -, sqlite , glib-networking , granite , evolution-data-server @@ -32,6 +31,21 @@ stdenv.mkDerivation rec { sha256 = "sha256-DO3nybH7tb/ISrSQ3+Oj612m64Ov6X0GAWePMbKjCc4="; }; + patches = [ + # build: fix documentation build + # https://github.com/elementary/mail/pull/795 + (fetchpatch { + url = "https://github.com/elementary/mail/commit/52a422cb1c5f061d8a683005e44da0a1c2195096.patch"; + sha256 = "sha256-ndcIZXvmQbM/31Wtm6OSCnXdMYx+OlJrqV+baq6m+KY="; + }) + # build: support webkit2gtk-4.1 + # https://github.com/elementary/mail/pull/794 + (fetchpatch { + url = "https://github.com/elementary/mail/commit/7d4878543b27251664852c708d54abc1e4580eab.patch"; + sha256 = "sha256-yl6Bzjinp+ti/aX+t22GibGeQFtharZNk3MmbuJm0Tk="; + }) + ]; + nativeBuildInputs = [ libxml2 meson @@ -48,11 +62,9 @@ stdenv.mkDerivation rec { glib-networking granite gtk3 - libgdata libgee libhandy - sqlite - webkitgtk + webkitgtk_4_1 ]; postPatch = '' |