pantheon.wingpanel-indicator-datetime: support libecal-2.0

https://github.com/elementary/wingpanel-indicator-datetime/pull/202 💖
This commit is contained in:
worldofpeace 2019-12-06 13:51:05 -05:00
parent 3ccbce4b12
commit 7e06a3c256

View File

@ -16,23 +16,8 @@
, libxml2 , libxml2
, libsoup , libsoup
, elementary-calendar , elementary-calendar
, fetchurl
}: }:
let
# Terrible workaround https://github.com/elementary/wingpanel-indicator-datetime/issues/122
# Evolution Data Server functionality will be broken (events from calendar in indicator)
# but at least we don't fail to build.
old-evolution-data-server = evolution-data-server.overrideAttrs(old: {
src = fetchurl {
url = "mirror://gnome/sources/evolution-data-server/${stdenv.lib.versions.majorMinor "3.32.4"}/${old.pname}-3.32.4.tar.xz";
sha256 = "0zsc9xwy6ixk3x0dx69ax5isrdw8qxjdxg2i5fr95s40nss7rxl3";
};
});
in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "wingpanel-indicator-datetime"; pname = "wingpanel-indicator-datetime";
version = "2.2.1"; version = "2.2.1";
@ -60,7 +45,7 @@ stdenv.mkDerivation rec {
]; ];
buildInputs = [ buildInputs = [
old-evolution-data-server evolution-data-server
granite granite
gtk3 gtk3
libgee libgee
@ -69,6 +54,14 @@ stdenv.mkDerivation rec {
wingpanel wingpanel
]; ];
patches = [
# Add support for libecal-2.0
(fetchpatch {
url = "https://github.com/elementary/wingpanel-indicator-datetime/commit/3ccd05d611e6dd5274a03f061ba1b5e13d6fe0cf.patch";
sha256 = "011q9b4pjmk4fpq5zscl5r8m4n3jiyx464023h4j7zf8r1070jz6";
})
];
postPatch = '' postPatch = ''
chmod +x meson/post_install.py chmod +x meson/post_install.py
patchShebangs meson/post_install.py patchShebangs meson/post_install.py