From b4b00016a26dabe0a6f6a9a8012288eff4a61d49 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 22 Mar 2018 15:40:21 +0100
Subject: epiphany: clean up

---
 pkgs/desktops/gnome-3/core/epiphany/default.nix | 36 +++++++++++++------------
 1 file changed, 19 insertions(+), 17 deletions(-)

(limited to 'pkgs/desktops/gnome-3/core')

diff --git a/pkgs/desktops/gnome-3/core/epiphany/default.nix b/pkgs/desktops/gnome-3/core/epiphany/default.nix
index 3bc32f99f3ef..6877b20df44d 100644
--- a/pkgs/desktops/gnome-3/core/epiphany/default.nix
+++ b/pkgs/desktops/gnome-3/core/epiphany/default.nix
@@ -1,8 +1,8 @@
 { stdenv, meson, ninja, gettext, fetchurl, pkgconfig, gtk, glib, icu
 , wrapGAppsHook, gnome3, libxml2, libxslt, itstool
 , webkitgtk, libsoup, glib-networking, libsecret, gnome-desktop, libnotify, p11-kit
-, sqlite, gcr, isocodes, desktop-file-utils, file
-, gdk_pixbuf, gnome-common, gst_all_1, json-glib }:
+, sqlite, gcr, isocodes, desktop-file-utils
+, gdk_pixbuf, gst_all_1, json-glib }:
 
 stdenv.mkDerivation rec {
   name = "epiphany-${version}";
@@ -13,31 +13,33 @@ stdenv.mkDerivation rec {
     sha256 = "023q6xnwsafac38lavxwgph5lcd2igxpiwqb4kr72mv56xlb0m3i";
   };
 
-  passthru = {
-    updateScript = gnome3.updateScript { packageName = "epiphany"; };
-  };
-
   # Tests need an X display
   mesonFlags = [ "-Dunit_tests=false" ];
 
-  propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ];
-
-  nativeBuildInputs = [ meson ninja libxslt pkgconfig itstool gettext file wrapGAppsHook desktop-file-utils ];
+  nativeBuildInputs = [
+    meson ninja libxslt pkgconfig itstool gettext wrapGAppsHook desktop-file-utils
+  ];
 
-  buildInputs = [ gtk glib webkitgtk libsoup libxml2 libsecret gnome-desktop libnotify
-                  sqlite isocodes p11-kit icu gnome3.yelp-tools
-                  gdk_pixbuf gnome3.defaultIconTheme gnome-common gcr
-                  glib-networking gst_all_1.gstreamer gst_all_1.gst-plugins-base
-                  gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad gst_all_1.gst-plugins-ugly
-                  gst_all_1.gst-libav json-glib ];
-
-  enableParallelBuilding = true;
+  buildInputs = [
+    gtk glib webkitgtk libsoup libxml2 libsecret gnome-desktop libnotify
+    sqlite isocodes p11-kit icu
+    gdk_pixbuf gnome3.defaultIconTheme gcr
+    glib-networking gst_all_1.gstreamer gst_all_1.gst-plugins-base
+    gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad gst_all_1.gst-plugins-ugly
+    gst_all_1.gst-libav json-glib
+  ];
 
   postPatch = ''
     chmod +x post_install.py # patchShebangs requires executable file
     patchShebangs post_install.py
   '';
 
+  passthru = {
+    updateScript = gnome3.updateScript {
+      packageName = "epiphany";
+    };
+  };
+
   meta = with stdenv.lib; {
     homepage = https://wiki.gnome.org/Apps/Epiphany;
     description = "WebKit based web browser for GNOME";
-- 
cgit 1.4.1