pantheon.elementary-mail: Fix build with evolution-data-server 3.46
This commit is contained in:
parent
0cce06c632
commit
c4c899062a
1 changed files with 18 additions and 6 deletions
|
@ -1,6 +1,7 @@
|
||||||
{ lib
|
{ lib
|
||||||
, stdenv
|
, stdenv
|
||||||
, fetchFromGitHub
|
, fetchFromGitHub
|
||||||
|
, fetchpatch
|
||||||
, nix-update-script
|
, nix-update-script
|
||||||
, pkg-config
|
, pkg-config
|
||||||
, meson
|
, meson
|
||||||
|
@ -10,10 +11,8 @@
|
||||||
, gtk3
|
, gtk3
|
||||||
, libxml2
|
, libxml2
|
||||||
, libhandy
|
, libhandy
|
||||||
, webkitgtk
|
, webkitgtk_4_1
|
||||||
, folks
|
, folks
|
||||||
, libgdata
|
|
||||||
, sqlite
|
|
||||||
, glib-networking
|
, glib-networking
|
||||||
, granite
|
, granite
|
||||||
, evolution-data-server
|
, evolution-data-server
|
||||||
|
@ -32,6 +31,21 @@ stdenv.mkDerivation rec {
|
||||||
sha256 = "sha256-DO3nybH7tb/ISrSQ3+Oj612m64Ov6X0GAWePMbKjCc4=";
|
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 = [
|
nativeBuildInputs = [
|
||||||
libxml2
|
libxml2
|
||||||
meson
|
meson
|
||||||
|
@ -48,11 +62,9 @@ stdenv.mkDerivation rec {
|
||||||
glib-networking
|
glib-networking
|
||||||
granite
|
granite
|
||||||
gtk3
|
gtk3
|
||||||
libgdata
|
|
||||||
libgee
|
libgee
|
||||||
libhandy
|
libhandy
|
||||||
sqlite
|
webkitgtk_4_1
|
||||||
webkitgtk
|
|
||||||
];
|
];
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
|
|
Loading…
Reference in a new issue