diff --git a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
new file mode 100644
index 000000000000..cb3db8432b62
--- /dev/null
+++ b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
@@ -0,0 +1,24 @@
+{ fetchurl, stdenv, pkgconfig, gnome3, python, intltool, libsoup, libxml2, libsecret
+, p11_kit, db4, nspr, nss, libical, gperf }:
+
+
+stdenv.mkDerivation rec {
+  name = "evolution-data-server-3.10.2";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/evolution-data-server/3.10/${name}.tar.xz";
+    sha256 = "1fgchc1gzrhhzgn4zf9par4yz72m82j871kf7pky458mh4c4sf0g";
+  };
+
+  buildInputs = with gnome3;
+    [ pkgconfig glib python intltool libsoup libxml2 gtk gnome_online_accounts libsecret
+      gcr p11_kit db4 nspr nss libgweather libical libgdata gperf ];
+
+  # uoa irrelevant for now
+  configureFlags = "--disable-uoa --with-nspr-includes=${nspr}/include/nspr --with-nss-includes=${nss}/include/nss";
+
+  meta = with stdenv.lib; {
+    platforms = platforms.linux;
+  };
+
+}
diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix
index 7f2ed9acb1ac..f83355f00435 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@@ -24,6 +24,8 @@ rec {
 
   evince = callPackage ./core/evince { }; # ToDo: dbus would prevent compilation, enable tests
 
+  evolution_data_server = callPackage ./core/evolution-data-server { };
+
   gconf = callPackage ./core/gconf { };
 
   geocode_glib = callPackage ./core/geocode-glib { };
diff --git a/pkgs/servers/evolution-data-server/default.nix b/pkgs/servers/evolution-data-server/default.nix
deleted file mode 100644
index 3a905a82db8b..000000000000
--- a/pkgs/servers/evolution-data-server/default.nix
+++ /dev/null
@@ -1,57 +0,0 @@
-x@{builderDefsPackage
-  , pkgconfig, flex, bison, libtool, intltool, perl
-  , db4, krb5, openldap, glib, libxml2, GConf
-  , nss, gtk, libgnome, libsoup, gnome_keyring
-  , gtkdoc, sqlite, libgweather, libical, icu
-  , dbus_glib, gperf, nspr, gmp, nettle, libgdata_0_6
-  , ...}:
-builderDefsPackage
-(a :  
-let 
-  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ 
-    [];
-
-  buildInputs = map (n: builtins.getAttr n x)
-    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
-  sourceInfo = rec {
-    url = "mirror://gnome/sources/evolution-data-server/2.32/evolution-data-server-2.32.3.tar.bz2";
-    hash = "744026a745b711b3e393b61fed21c4926d1b10a3aa7da64f4b33a3e3bf5b085c";
-    version = "2.32.3";
-    name = "evolution-data-server-${version}";
-  };
-in
-rec {
-  src = a.fetchurl {
-    url = sourceInfo.url;
-    sha256 = sourceInfo.hash;
-  };
-
-  inherit (sourceInfo) name version;
-  inherit buildInputs;
-
-  /* doConfigure should be removed if not needed */
-  phaseNames = ["doConfigure" "doMakeInstall"];
-
-  configureFlags = [
-    "--with-nspr-includes=${nspr}/include/nspr"
-    "--with-nss-includes=${nss}/include/nss"
-  ];
-      
-  meta = {
-    description = "Evolution Data Server";
-    maintainers = with a.lib.maintainers;
-    [
-      /* I am only interested in it for libebook... */
-      raskin
-    ];
-    platforms = with a.lib.platforms;
-      linux;
-    broken = true;
-  };
-  passthru = {
-    updateInfo = {
-      downloadPage = "http://projects.gnome.org/evolution/download.shtml";
-    };
-  };
-}) x
-
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 533d365ac304..4e52a0fba346 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7713,8 +7713,9 @@ let
   keepassx = callPackage ../applications/misc/keepassx { };
 
   inherit (gnome3) evince;
+  evolution_data_server = gnome3.evolution_data_server;
+
   keepass = callPackage ../applications/misc/keepass { };
-  evolution_data_server = newScope (gnome) ../servers/evolution-data-server { };
 
   exrdisplay = callPackage ../applications/graphics/exrdisplay {
     fltk = fltk20;