public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

evolution-data-server: 3.28.2 → 3.28.3

Browse Source
This commit is contained in:
Jan Tojnar 2018-06-19 20:45:33 +02:00
parent 98eefba190
commit 48fd0e6f20
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
2 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
View File

@ -1,19 +1,26 @@
{ fetchurl, stdenv, pkgconfig, gnome3, python3, gobjectIntrospection { fetchurl, stdenv, substituteAll, pkgconfig, gnome3, python3, gobjectIntrospection
, intltool, libsoup, libxml2, libsecret, icu, sqlite , intltool, libsoup, libxml2, libsecret, icu, sqlite, tzdata
, p11-kit, db, nspr, nss, libical, gperf, wrapGAppsHook, glib-networking , p11-kit, db, nspr, nss, libical, gperf, wrapGAppsHook, glib-networking
, vala, cmake, ninja, kerberos, openldap, webkitgtk, libaccounts-glib, json-glib }: , vala, cmake, ninja, kerberos, openldap, webkitgtk, libaccounts-glib, json-glib }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "evolution-data-server-${version}"; name = "evolution-data-server-${version}";
version = "3.28.2"; version = "3.28.3";
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/evolution-data-server/${gnome3.versionBranch version}/${name}.tar.xz"; url = "mirror://gnome/sources/evolution-data-server/${gnome3.versionBranch version}/${name}.tar.xz";
sha256 = "1azk8zh167a6hyxzz73yh36gbpf7i52b7zi10hnnnsywh80pj6jk"; sha256 = "11sq795115vrcgxl9svscm6wg8isjj784c3d84qzb6z47zq92zj3";
}; };
patches = [
(substituteAll {
src = ./fix-paths.patch;
inherit tzdata;
})
];
nativeBuildInputs = [ nativeBuildInputs = [
cmake ninja pkgconfig intltool python3 gperf wrapGAppsHook gobjectIntrospection vala cmake ninja pkgconfig intltool python3 gperf wrapGAppsHook gobjectIntrospection vala
]; ];

11
pkgs/desktops/gnome-3/core/evolution-data-server/fix-paths.patch Normal file
View File

@ -0,0 +1,11 @@
--- a/src/calendar/libecal/e-cal-system-timezone.c
+++ b/src/calendar/libecal/e-cal-system-timezone.c
@@ -26,7 +26,7 @@
#ifdef HAVE_SOLARIS
#define SYSTEM_ZONEINFODIR "/usr/share/lib/zoneinfo/tab"
#else
-#define SYSTEM_ZONEINFODIR "/usr/share/zoneinfo"
+#define SYSTEM_ZONEINFODIR "@tzdata@/share/zoneinfo"
#endif
#define ETC_TIMEZONE "/etc/timezone"