Revert "liferea: 1.10.18 -> 1.12-rc2"origin/release-16.03gitlab.intr/release-16.03

This reverts commit 73d9d2d5770dbfc698fa2e92080c5b49a79919e5.

It was pushed here accidentially, I've meant 17.03.

2 files changed, 28 insertions, 23 deletions

diff --git a/pkgs/applications/networking/newsreaders/liferea/default.nix b/pkgs/applications/networking/newsreaders/liferea/default.nix
index 0cb554480a1f..ff2b16b8a580 100644
--- a/pkgs/applications/networking/newsreaders/liferea/default.nix
+++ b/pkgs/applications/networking/newsreaders/liferea/default.nix
@@ -1,35 +1,40 @@
-{ stdenv, fetchurl, pkgconfig, intltool, python3Packages, wrapGAppsHook
-, glib, libxml2, libxslt, sqlite, libsoup , webkitgtk, json_glib, gst_all_1
-, libnotify, gtk3, gsettings_desktop_schemas, libpeas, dconf, librsvg
-, gobjectIntrospection, glib_networking
+{ stdenv, fetchurl, pkgconfig, intltool, python, pygobject3
+, glib, gnome3, pango, libxml2, libxslt, sqlite, libsoup, glib_networking
+, webkitgtk, json_glib, gobjectIntrospection, gst_all_1
+, libnotify
+, makeWrapper
 }:
 
-let
-  pname = "liferea";
-  version = "1.12-rc2";
-in stdenv.mkDerivation rec {
+let pname = "liferea";
+    version = "1.10.18";
+in
+stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "https://github.com/lwindolf/${pname}/releases/download/v${version}/${name}.tar.bz2";
-    sha256 = "1q83s900skl0w9pb0afq8z387ynhl0rqn6fmps8wmncj0z1q07wb";
+    sha256 = "0xyy0qm3h22b69if2hmg36jzvvljxb1w0zy2m2a28kdqfzpa6m8g";
   };
 
-  nativeBuildInputs = [ wrapGAppsHook python3Packages.wrapPython intltool pkgconfig ];
-
-  buildInputs = [
-    glib gtk3 webkitgtk libxml2 libxslt sqlite libsoup gsettings_desktop_schemas
-    libpeas gsettings_desktop_schemas json_glib dconf gobjectIntrospection
-    librsvg glib_networking
-  ] ++ (with gst_all_1; [
-    gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad
-  ]);
-
-  pythonPath = with python3Packages; [ pygobject3 pycairo ];
+  buildInputs = with gst_all_1; [
+    pkgconfig intltool python
+    glib gnome3.gtk pango libxml2 libxslt sqlite libsoup
+    webkitgtk json_glib gobjectIntrospection gnome3.gsettings_desktop_schemas
+    gnome3.libpeas gnome3.dconf
+    gst-plugins-base gst-plugins-good gst-plugins-bad
+    gnome3.libgnome_keyring gnome3.defaultIconTheme
+    libnotify
+    makeWrapper
+  ];
 
   preFixup = ''
-    buildPythonPath "$out $pythonPath"
-    gappsWrapperArgs+=(--prefix PYTHONPATH : "$program_PYTHONPATH")
+    for f in "$out"/bin/*; do
+      wrapProgram "$f" \
+        --prefix PYTHONPATH : "$(toPythonPath $out):$(toPythonPath ${pygobject3})" \
+        --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
+        --prefix GIO_EXTRA_MODULES : "${gnome3.dconf}/lib/gio/modules:${glib_networking}/lib/gio/modules" \
+        --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gnome3.gtk}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
+    done
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f761242138fb..920e8fe3488a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12923,7 +12923,7 @@ let
   };
 
   liferea = callPackage ../applications/networking/newsreaders/liferea {
-    inherit (gnome3) libpeas gsettings_desktop_schemas dconf;
+    webkitgtk = webkitgtk24x;
   };
 
   lingot = callPackage ../applications/audio/lingot {