From b68156006ad41025d5e9d338888756ac4ab6e373 Mon Sep 17 00:00:00 2001
From: Jaakko Luttinen <jaakko.luttinen@iki.fi>
Date: Tue, 2 Jan 2018 18:19:16 +0200
Subject: [PATCH] rssguard: 3.4.2 -> 3.5.5

---
 .../feedreaders/rssguard/default.nix          | 25 +++++++++++--------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/networking/feedreaders/rssguard/default.nix b/pkgs/applications/networking/feedreaders/rssguard/default.nix
index b25d4e109eb..0a89ec6023b 100644
--- a/pkgs/applications/networking/feedreaders/rssguard/default.nix
+++ b/pkgs/applications/networking/feedreaders/rssguard/default.nix
@@ -1,22 +1,27 @@
-{ stdenv, fetchgit, qmake, qtwebengine, qttools, wrapGAppsHook }:
+{ stdenv, fetchFromGitHub, qmake, qtwebengine, qttools, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
-  name = "rssguard-${version}";
-  version = "3.4.2";
+  name = "${pname}-${version}";
+  pname = "rssguard";
+  version = "3.5.5";
 
-  src = fetchgit {
-    url = https://github.com/martinrotter/rssguard;
-    rev = "refs/tags/${version}";
-    sha256 = "0iy0fd3qr2dm0pc6xr7sin6cjfxfa0pxhxiwzs55dhsdk9zir62s";
-    # Submodules are required only for Windows (and one of them is a huge binary
-    # package ~400MB). See project wiki for more details.
-    fetchSubmodules = false;
+  src = fetchFromGitHub {
+    owner = "martinrotter";
+    repo = pname;
+    rev = version;
+    sha256 = "0swjh664y1yqr1rn3ym2kicyx7r97ypr4qf7qrjl4a5q1spzsv48";
   };
 
   buildInputs =  [ qtwebengine qttools ];
   nativeBuildInputs = [ qmake wrapGAppsHook ];
   qmakeFlags = [ "CONFIG+=release" ];
 
+  # FIXME: This shouldn't be needed after 3.5.5.
+  # See: https://github.com/martinrotter/rssguard/issues/175
+  preConfigure = ''
+    lrelease rssguard.pro
+  '';
+
   meta = with stdenv.lib; {
     description = "Simple RSS/Atom feed reader with online synchronization";
     longDescription = ''