From 3cf146064216083e67f5b1b6f49b810170b13761 Mon Sep 17 00:00:00 2001
From: Reno Dakota <170618376+paparodeo@users.noreply.github.com>
Date: Sat, 26 Oct 2024 10:49:18 +0000
Subject: [PATCH 1/2] rsstail: 2.1 -> 2.2

fix linking to libiconv on darwin

https://github.com/folkertvanheusden/rsstail/compare/6f2436185372b3f945a4989406c4b6a934fe8a95...v2.2
---
 .../feedreaders/rsstail/default.nix           | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/networking/feedreaders/rsstail/default.nix b/pkgs/applications/networking/feedreaders/rsstail/default.nix
index cecad11a4f632..49cad39911d06 100644
--- a/pkgs/applications/networking/feedreaders/rsstail/default.nix
+++ b/pkgs/applications/networking/feedreaders/rsstail/default.nix
@@ -1,25 +1,25 @@
-{ lib, stdenv, fetchFromGitHub, libmrss, libiconv }:
+{ lib, stdenv, fetchFromGitHub, libmrss }:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation (final: {
   pname = "rsstail";
-  version = "2.1";
+  version = "2.2";
 
   src = fetchFromGitHub {
     owner = "folkertvanheusden";
     repo = "rsstail";
-    rev = "6f2436185372b3f945a4989406c4b6a934fe8a95";
-    sha256 = "12p69i3g1fwlw0bds9jqsdmzkid3k5a41w31d227i7vm12wcvjf6";
+    rev = "v${final.version}";
+    hash = "sha256-wbdf9zhwMN7QhJ5WoJo1Csu0EcKUTON8Q2Ic5scbn7I=";
   };
 
-  buildInputs = [ libmrss ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ];
-
-  postPatch = ''
-    substituteInPlace Makefile --replace -liconv_hook ""
-  '';
+  buildInputs = [ libmrss ];
 
   makeFlags = [ "prefix=$(out)" ];
   enableParallelBuilding = true;
 
+  env = lib.optionalAttrs stdenv.hostPlatform.isDarwin {
+    NIX_LDFLAGS = "-liconv";
+  };
+
   # just runs cppcheck linter
   doCheck = false;
 
@@ -35,4 +35,4 @@ stdenv.mkDerivation {
     maintainers = [ maintainers.Necior ];
     platforms = platforms.unix;
   };
-}
+})

From b83302b045f70571a4d1ef1e40e7b7f7e79bfbb8 Mon Sep 17 00:00:00 2001
From: Reno Dakota <170618376+paparodeo@users.noreply.github.com>
Date: Sat, 26 Oct 2024 19:09:46 +0000
Subject: [PATCH 2/2] rsstail: adjust license to gpl2Only

---
 pkgs/applications/networking/feedreaders/rsstail/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/feedreaders/rsstail/default.nix b/pkgs/applications/networking/feedreaders/rsstail/default.nix
index 49cad39911d06..c654bd4e8a1d9 100644
--- a/pkgs/applications/networking/feedreaders/rsstail/default.nix
+++ b/pkgs/applications/networking/feedreaders/rsstail/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation (final: {
       detects a new entry it'll emit only that new entry.
     '';
     homepage = "https://www.vanheusden.com/rsstail/";
-    license = licenses.gpl2Plus;
+    license = licenses.gpl2Only;
     maintainers = [ maintainers.Necior ];
     platforms = platforms.unix;
   };