From fe53a6c17c0d6388748b593b8513b9c8cfbaf4de Mon Sep 17 00:00:00 2001
From: Jaakko Luttinen <jaakko.luttinen@iki.fi>
Date: Thu, 1 Jun 2017 21:35:03 +0300
Subject: [PATCH 1/2] rssguard: init at 3.4.0

---
 .../feedreaders/rssguard/default.nix          | 37 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  3 ++
 2 files changed, 40 insertions(+)
 create mode 100644 pkgs/applications/networking/feedreaders/rssguard/default.nix

diff --git a/pkgs/applications/networking/feedreaders/rssguard/default.nix b/pkgs/applications/networking/feedreaders/rssguard/default.nix
new file mode 100644
index 000000000000..0c17485b27b3
--- /dev/null
+++ b/pkgs/applications/networking/feedreaders/rssguard/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, fetchFromGitHub, qmakeHook, qtwebengine, qttools }:
+
+stdenv.mkDerivation rec {
+  name = "rssguard-${version}";
+  version = "3.4.0";
+
+  src = fetchFromGitHub {
+    owner = "martinrotter";
+    repo = "rssguard";
+    # fetchFromGitHub doesn't support rev being a tag when fetchSubmodules=true,
+    # so need to use the hash commit. See:
+    # https://github.com/NixOS/nixpkgs/issues/26302
+    #rev = "${version}";
+    rev = "cb15ba92c9bc1b80e2b81d7976438e562ee1ef90";
+    sha256 = "1cdpfjj2lm1q2qh0w0mh505blcmi4n78458d3z3c1zn9ls9b9zsp";
+    fetchSubmodules = true;
+  };
+
+  buildInputs =  [ qmakeHook qtwebengine qttools ];
+
+  preConfigure = ''
+    qmakeFlags="$qmakeFlags CONFIG+=release"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Simple RSS/Atom feed reader with online synchronization";
+    longDescription = ''
+      RSS Guard is a simple, light and easy-to-use RSS/ATOM feed aggregator
+      developed using Qt framework and with online feed synchronization support
+      for ownCloud/Nextcloud.
+    '';
+    homepage = https://github.com/martinrotter/rssguard;
+    license = licenses.gpl3;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ jluttine ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 647aea58623b..c148252df667 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15162,6 +15162,9 @@ with pkgs;
 
   polybar = callPackage ../applications/misc/polybar { };
 
+  rssguard = libsForQt5.callPackage ../applications/networking/feedreaders/rssguard { };
+  #rssguard = libsForQt5.callPackage ../applications/networking/newsreaders/rssguard { };
+
   scudcloud = callPackage ../applications/networking/instant-messengers/scudcloud { };
 
   shotcut = libsForQt5.callPackage ../applications/video/shotcut { };

From 85aa14fa373c5986d0aa08d66461c8c38458b16d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 6 Jun 2017 00:24:11 +0100
Subject: [PATCH 2/2] rssguard: use fetchgit; wrapGAppsHook

---
 .../feedreaders/rssguard/default.nix          | 21 +++++++------------
 pkgs/top-level/all-packages.nix               |  1 -
 2 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/pkgs/applications/networking/feedreaders/rssguard/default.nix b/pkgs/applications/networking/feedreaders/rssguard/default.nix
index 0c17485b27b3..a9e3c1d74e26 100644
--- a/pkgs/applications/networking/feedreaders/rssguard/default.nix
+++ b/pkgs/applications/networking/feedreaders/rssguard/default.nix
@@ -1,26 +1,19 @@
-{ stdenv, fetchFromGitHub, qmakeHook, qtwebengine, qttools }:
+{ stdenv, fetchgit, qmakeHook, qtwebengine, qttools, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   name = "rssguard-${version}";
   version = "3.4.0";
 
-  src = fetchFromGitHub {
-    owner = "martinrotter";
-    repo = "rssguard";
-    # fetchFromGitHub doesn't support rev being a tag when fetchSubmodules=true,
-    # so need to use the hash commit. See:
-    # https://github.com/NixOS/nixpkgs/issues/26302
-    #rev = "${version}";
-    rev = "cb15ba92c9bc1b80e2b81d7976438e562ee1ef90";
+  src = fetchgit {
+    url = https://github.com/martinrotter/rssguard;
+    rev = "refs/tags/${version}";
     sha256 = "1cdpfjj2lm1q2qh0w0mh505blcmi4n78458d3z3c1zn9ls9b9zsp";
     fetchSubmodules = true;
   };
 
-  buildInputs =  [ qmakeHook qtwebengine qttools ];
-
-  preConfigure = ''
-    qmakeFlags="$qmakeFlags CONFIG+=release"
-  '';
+  buildInputs =  [ qtwebengine qttools ];
+  nativeBuildInputs = [ qmakeHook wrapGAppsHook ];
+  qmakeFlags = [ "CONFIG+=release" ];
 
   meta = with stdenv.lib; {
     description = "Simple RSS/Atom feed reader with online synchronization";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c148252df667..2ace6bb8ace3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15163,7 +15163,6 @@ with pkgs;
   polybar = callPackage ../applications/misc/polybar { };
 
   rssguard = libsForQt5.callPackage ../applications/networking/feedreaders/rssguard { };
-  #rssguard = libsForQt5.callPackage ../applications/networking/newsreaders/rssguard { };
 
   scudcloud = callPackage ../applications/networking/instant-messengers/scudcloud { };