From 07b0f00911f634e5c20a67fc739dff7151a9fe59 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Tue, 25 Jun 2019 13:50:11 -0400
Subject: [PATCH] gnome3.evolution: cleanup

---
 .../gnome-3/apps/evolution/default.nix        | 120 ++++++++++++++----
 1 file changed, 94 insertions(+), 26 deletions(-)

diff --git a/pkgs/desktops/gnome-3/apps/evolution/default.nix b/pkgs/desktops/gnome-3/apps/evolution/default.nix
index 7108b3aeda2..b82c1b2dfe5 100644
--- a/pkgs/desktops/gnome-3/apps/evolution/default.nix
+++ b/pkgs/desktops/gnome-3/apps/evolution/default.nix
@@ -1,41 +1,111 @@
-{ stdenv, cmake, ninja, intltool, fetchurl, libxml2, webkitgtk, highlight
-, pkgconfig, gtk3, glib, libnotify, gtkspell3, evolution-data-server
-, adwaita-icon-theme, gnome-desktop, libgdata
-, libgweather, glib-networking, gsettings-desktop-schemas
-, 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 }:
+{ stdenv
+, cmake
+, ninja
+, intltool
+, fetchurl
+, libxml2
+, webkitgtk
+, highlight
+, pkgconfig
+, gtk3
+, glib
+, libnotify
+, gtkspell3
+, evolution-data-server
+, adwaita-icon-theme
+, gnome-desktop
+, libgdata
+, libgweather
+, glib-networking
+, gsettings-desktop-schemas
+, 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
+stdenv.mkDerivation rec {
+  pname = "evolution";
   version = "3.32.3";
-in stdenv.mkDerivation rec {
-  name = "evolution-${version}";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/evolution/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/evolution/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0ghwi4mmx6l28dkjx7ayiqcrvmfakqfiyvdg6946v5dcimgsclxn";
   };
 
-  propagatedUserEnvPkgs = [ evolution-data-server ];
-
-  buildInputs = [
-    gtk3 glib gdk_pixbuf adwaita-icon-theme librsvg db icu
-    evolution-data-server libsecret libical gcr
-    webkitgtk shared-mime-info gnome-desktop gtkspell3
-    libcanberra-gtk3 bogofilter libgdata sqlite
-    gst_all_1.gstreamer gst_all_1.gst-plugins-base p11-kit
-    nss nspr libnotify procps highlight libgweather
-    gsettings-desktop-schemas
-    glib-networking openldap
+  nativeBuildInputs = [
+    cmake
+    intltool
+    itstool
+    libxml2
+    ninja
+    pkgconfig
+    wrapGAppsHook
   ];
 
-  nativeBuildInputs = [ cmake ninja intltool itstool libxml2 pkgconfig wrapGAppsHook ];
+  buildInputs = [
+    adwaita-icon-theme
+    bogofilter
+    db
+    evolution-data-server
+    gcr
+    gdk_pixbuf
+    glib
+    glib-networking
+    gnome-desktop
+    gsettings-desktop-schemas
+    gst_all_1.gst-plugins-base
+    gst_all_1.gstreamer
+    gtk3
+    gtkspell3
+    highlight
+    icu
+    libcanberra-gtk3
+    libgdata
+    libgweather
+    libical
+    libnotify
+    librsvg
+    libsecret
+    nspr
+    nss
+    openldap
+    p11-kit
+    procps
+    shared-mime-info
+    sqlite
+    webkitgtk
+  ];
+
+  propagatedUserEnvPkgs = [
+    evolution-data-server
+  ];
 
   cmakeFlags = [
     "-DENABLE_AUTOAR=OFF"
     "-DENABLE_LIBCRYPTUI=OFF"
-    "-DENABLE_YTNEF=OFF"
     "-DENABLE_PST_IMPORT=OFF"
+    "-DENABLE_YTNEF=OFF"
+  ];
+
+  requiredSystemFeatures = [
+    "big-parallel"
   ];
 
   doCheck = true;
@@ -49,8 +119,6 @@ in stdenv.mkDerivation rec {
 
   PKG_CONFIG_LIBEDATASERVERUI_1_2_UIMODULEDIR = "${placeholder "out"}/lib/evolution-data-server/ui-modules";
 
-  requiredSystemFeatures = [ "big-parallel" ];
-
   meta = with stdenv.lib; {
     homepage = https://wiki.gnome.org/Apps/Evolution;
     description = "Personal information management application that provides integrated mail, calendaring and address book functionality";