From a276404d44bf6b5c11dc17621bfedfa7d6e8ab9c Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Sat, 30 Jun 2018 13:23:37 +0000
Subject: [PATCH] eolie: 0.9.16 -> 0.9.35 (#42813)

---
 ...python-path-rather-than-replacing-it.patch | 35 ----------
 .../networking/browsers/eolie/default.nix     | 70 ++++++++-----------
 2 files changed, 28 insertions(+), 77 deletions(-)
 delete mode 100644 pkgs/applications/networking/browsers/eolie/0001-Extend-the-python-path-rather-than-replacing-it.patch

diff --git a/pkgs/applications/networking/browsers/eolie/0001-Extend-the-python-path-rather-than-replacing-it.patch b/pkgs/applications/networking/browsers/eolie/0001-Extend-the-python-path-rather-than-replacing-it.patch
deleted file mode 100644
index 347fb8e1287..00000000000
--- a/pkgs/applications/networking/browsers/eolie/0001-Extend-the-python-path-rather-than-replacing-it.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From b51b63b78c9ff1639f5f65ccfdd54681f1cadc1d Mon Sep 17 00:00:00 2001
-From: Sam Parkinson <sam@sam.today>
-Date: Tue, 26 Dec 2017 14:46:27 +1100
-Subject: [PATCH] Extend the python path; rather than replacing it
-
-Some distros (i.e. NixOS) require the special PYTHONPATH, so that
-the web extension has access to the python packages it wants (i.e. gi).
-
-Previously, the PYTHONPATH was replaced with the web extension path;
-meaning it would crash on NixOS.  This instead prepends the web
-extension path to the PYTHONPATH.
----
- eolie/application.py | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/eolie/application.py b/eolie/application.py
-index 3c21542..bed4e55 100644
---- a/eolie/application.py
-+++ b/eolie/application.py
-@@ -340,7 +340,11 @@ class Application(Gtk.Application):
-         self.settings = Settings.new()
- 
-         # Init extensions
--        GLib.setenv("PYTHONPATH", self.__extension_dir, True)
-+        current_path = GLib.getenv("PYTHONPATH")
-+        new_path = self.__extension_dir
-+        if current_path:
-+            new_path = new_path + ':' + current_path
-+        GLib.setenv("PYTHONPATH", new_path, True)
- 
-         # Create favicon path
-         if not GLib.file_test(self.__FAVICONS_PATH, GLib.FileTest.IS_DIR):
--- 
-2.15.0
-
diff --git a/pkgs/applications/networking/browsers/eolie/default.nix b/pkgs/applications/networking/browsers/eolie/default.nix
index 9d4c858298d..5de6c0d882a 100644
--- a/pkgs/applications/networking/browsers/eolie/default.nix
+++ b/pkgs/applications/networking/browsers/eolie/default.nix
@@ -1,67 +1,53 @@
-{ stdenv, fetchgit, intltool, itstool, meson, ninja, pkgconfig, wrapGAppsHook
-, glib, glib-networking, gsettings-desktop-schemas, gst_all_1, gtk3, gobjectIntrospection
-, gtkspell3, libsecret, python36, python36Packages, webkitgtk }:
+{ stdenv, fetchgit, meson, ninja, pkgconfig, wrapGAppsHook
+, desktop-file-utils, gobjectIntrospection, python36Packages
+, gnome3, gst_all_1, gtkspell3, hunspell }:
 
 stdenv.mkDerivation rec {
   name = "eolie-${version}";
-  version = "0.9.16";
+  version = "0.9.35";
 
   src = fetchgit {
-    url = https://gitlab.gnome.org/gnumdk/eolie;
-    rev = version;
-    sha256 = "0mvhr6hy4nx7xaq9r9qp5rb0y293kjjryw5ykzb473cr3iwzk25b";
+    url = "https://gitlab.gnome.org/World/eolie";
+    rev = "refs/tags/${version}";
+    fetchSubmodules = true;
+    sha256 = "0x3p1fgx1fhrnr7vkkpnl34401r6k6xg2mrjff7ncb1k57q522k7";
   };
 
-  nativeBuildInputs = [
-    intltool
-    itstool
+  nativeBuildInputs = with python36Packages; [
+    desktop-file-utils
+    gobjectIntrospection
     meson
     ninja
     pkgconfig
     wrapGAppsHook
-    gobjectIntrospection
+    wrapPython
   ];
 
-  buildInputs = [
-    glib
-    glib-networking
-    gsettings-desktop-schemas
-    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
-    gtk3
-    gtkspell3
-    libsecret
-    python36
-    python36Packages.pygobject3
-    python36Packages.pycairo
-    python36Packages.dateutil
-    python36Packages.dbus-python
-    python36Packages.beautifulsoup4
-    python36Packages.pycrypto
-    python36Packages.requests
-    webkitgtk
+  buildInputs = [ gtkspell3 hunspell python36Packages.pygobject3 ] ++ (with gnome3; [
+    glib glib-networking gsettings_desktop_schemas gtk3 webkitgtk libsecret
+  ]) ++ (with gst_all_1; [
+    gst-libav gst-plugins-base gst-plugins-ugly gstreamer
+  ]);
+
+  pythonPath = with python36Packages; [
+    beautifulsoup4
+    pycairo
+    pygobject3
+    python-dateutil
   ];
 
-  wrapPrefixVariables = [ "PYTHONPATH" ];
+  postFixup = "wrapPythonPrograms";
 
   postPatch = ''
     chmod +x meson_post_install.py # patchShebangs requires executable file
     patchShebangs meson_post_install.py
   '';
 
-  patches = [
-    ./0001-Extend-the-python-path-rather-than-replacing-it.patch
-  ];
-
   meta = with stdenv.lib; {
     description = "A new GNOME web browser";
-    homepage = https://wiki.gnome.org/Apps/Eolie;
-    license = licenses.gpl3;
-    maintainers = [ maintainers.samdroid-apps ];
-    platforms = platforms.linux;
+    homepage    = https://wiki.gnome.org/Apps/Eolie;
+    license     = licenses.gpl3Plus;
+    maintainers = with maintainers; [ samdroid-apps worldofpeace ];
+    platforms   = platforms.linux;
   };
 }