diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2018-06-19 20:45:33 +0200 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2018-06-20 02:06:47 +0200 |
| commit | 48fd0e6f20cd835765d7803eff4ed116409d81e1 (patch) | |
| tree | 4144ed5a6cdc24a2a5a21e2e10d184af5a581f03 /pkgs/desktops/gnome-3 | |
| parent | 98eefba1906e8333d17f537d2b059362027f6660 (diff) | |
| download | nixlib-48fd0e6f20cd835765d7803eff4ed116409d81e1.tar nixlib-48fd0e6f20cd835765d7803eff4ed116409d81e1.tar.gz nixlib-48fd0e6f20cd835765d7803eff4ed116409d81e1.tar.bz2 nixlib-48fd0e6f20cd835765d7803eff4ed116409d81e1.tar.lz nixlib-48fd0e6f20cd835765d7803eff4ed116409d81e1.tar.xz nixlib-48fd0e6f20cd835765d7803eff4ed116409d81e1.tar.zst nixlib-48fd0e6f20cd835765d7803eff4ed116409d81e1.zip | |
evolution-data-server: 3.28.2 → 3.28.3
Diffstat (limited to 'pkgs/desktops/gnome-3')
| -rw-r--r-- | pkgs/desktops/gnome-3/core/evolution-data-server/default.nix | 15 | ||||
| -rw-r--r-- | pkgs/desktops/gnome-3/core/evolution-data-server/fix-paths.patch | 11 |
2 files changed, 22 insertions, 4 deletions
diff --git a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix index a95162068599..5146123cfd46 100644 --- a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix +++ b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix @@ -1,19 +1,26 @@ -{ fetchurl, stdenv, pkgconfig, gnome3, python3, gobjectIntrospection -, intltool, libsoup, libxml2, libsecret, icu, sqlite +{ fetchurl, stdenv, substituteAll, pkgconfig, gnome3, python3, gobjectIntrospection +, intltool, libsoup, libxml2, libsecret, icu, sqlite, tzdata , p11-kit, db, nspr, nss, libical, gperf, wrapGAppsHook, glib-networking , vala, cmake, ninja, kerberos, openldap, webkitgtk, libaccounts-glib, json-glib }: stdenv.mkDerivation rec { name = "evolution-data-server-${version}"; - version = "3.28.2"; + version = "3.28.3"; outputs = [ "out" "dev" ]; src = fetchurl { 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 = [ cmake ninja pkgconfig intltool python3 gperf wrapGAppsHook gobjectIntrospection vala ]; diff --git a/pkgs/desktops/gnome-3/core/evolution-data-server/fix-paths.patch b/pkgs/desktops/gnome-3/core/evolution-data-server/fix-paths.patch new file mode 100644 index 000000000000..334235516591 --- /dev/null +++ b/pkgs/desktops/gnome-3/core/evolution-data-server/fix-paths.patch @@ -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" |