gnome3.evolution: switch to ninja

1 files changed, 28 insertions, 29 deletions

diff --git a/pkgs/desktops/gnome-3/apps/evolution/default.nix b/pkgs/desktops/gnome-3/apps/evolution/default.nix
index 8c5709c2f121..a1586754dbdd 100644
--- a/pkgs/desktops/gnome-3/apps/evolution/default.nix
+++ b/pkgs/desktops/gnome-3/apps/evolution/default.nix
@@ -1,52 +1,51 @@
-{ stdenv, cmake, intltool, fetchurl, libxml2, webkitgtk, highlight
+{ stdenv, cmake, ninja, intltool, fetchurl, libxml2, webkitgtk, highlight
 , pkgconfig, gtk3, glib, libnotify, gtkspell3
 , wrapGAppsHook, itstool, shared-mime-info, libical, db, gcr, sqlite
 , gnome3, librsvg, gdk_pixbuf, libsecret, nss, nspr, icu
 , libcanberra-gtk3, bogofilter, gst_all_1, procps, p11-kit, openldap }:
 
 let
-  majVer = gnome3.version;
+  version = "3.26.5";
 in stdenv.mkDerivation rec {
   name = "evolution-${version}";
-  version = "3.26.5";
 
   src = fetchurl {
     url = "mirror://gnome/sources/evolution/${gnome3.versionBranch version}/${name}.tar.xz";
     sha256 = "1j748f3407zavrh3bqw0mpf8f1i6b788kfjvwkk5bg7mm3c65n2g";
   };
 
-  passthru = {
-    updateScript = gnome3.updateScript { packageName = "evolution"; attrPath = "gnome3.evolution"; };
-  };
-
-  doCheck = true;
+  propagatedUserEnvPkgs = [ gnome3.evolution-data-server ];
 
-  propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard
-                            gnome3.evolution-data-server ];
+  buildInputs = [
+    gtk3 glib gdk_pixbuf gnome3.defaultIconTheme librsvg db icu
+    gnome3.evolution-data-server libsecret libical gcr
+    webkitgtk shared-mime-info gnome3.gnome-desktop gtkspell3
+    libcanberra-gtk3 bogofilter gnome3.libgdata sqlite
+    gst_all_1.gstreamer gst_all_1.gst-plugins-base p11-kit
+    nss nspr libnotify procps highlight gnome3.libgweather
+    gnome3.gsettings-desktop-schemas
+    gnome3.libgnome-keyring gnome3.glib-networking openldap
+  ];
 
-  buildInputs = [ gtk3 glib gdk_pixbuf gnome3.defaultIconTheme librsvg db icu
-                  gnome3.evolution-data-server libsecret libical gcr
-                  webkitgtk shared-mime-info gnome3.gnome-desktop gtkspell3
-                  libcanberra-gtk3 bogofilter gnome3.libgdata sqlite
-                  gst_all_1.gstreamer gst_all_1.gst-plugins-base p11-kit
-                  nss nspr libnotify procps highlight gnome3.libgweather
-                  gnome3.gsettings-desktop-schemas
-                  gnome3.libgnome-keyring gnome3.glib-networking openldap
-                ];
+  nativeBuildInputs = [ cmake ninja intltool itstool libxml2 pkgconfig wrapGAppsHook ];
 
-  nativeBuildInputs = [ cmake intltool itstool libxml2 pkgconfig wrapGAppsHook ];
+  cmakeFlags = [
+    "-DENABLE_AUTOAR=OFF"
+    "-DENABLE_LIBCRYPTUI=OFF"
+    "-DENABLE_YTNEF=OFF"
+    "-DENABLE_PST_IMPORT=OFF"
+  ];
 
+  doCheck = true;
 
-  configureFlags = [ "--disable-pst-import" "--disable-autoar"
-                     "--disable-libcryptui" "--with-openldap"];
-
-  cmakeFlags = [ "-DENABLE_AUTOAR=OFF" "-DENABLE_LIBCRYPTUI=OFF"
-                 "-DENABLE_YTNEF=OFF" "-DENABLE_PST_IMPORT=OFF"
-               ];
-
-  NIX_CFLAGS_COMPILE = "-I${nss.dev}/include/nss -I${glib.dev}/include/gio-unix-2.0";
+  checkPhase = "ctest";
 
-  enableParallelBuilding = true;
+  passthru = {
+    updateScript = gnome3.updateScript {
+      packageName = "evolution";
+      attrPath = "gnome3.evolution";
+    };
+  };
 
   requiredSystemFeatures = [ "big-parallel" ];