From 05fce89a1b2bc7b32b192e7e4818049bc9d3cd06 Mon Sep 17 00:00:00 2001
From: zendo <linzway@qq.com>
Date: Thu, 29 Sep 2022 09:14:16 +0800
Subject: [PATCH] newsflash: 1.5.2 -> 2.0.1

---
 .../feedreaders/newsflash/default.nix         | 21 ++++++++++++-------
 pkgs/top-level/all-packages.nix               |  4 +++-
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/networking/feedreaders/newsflash/default.nix b/pkgs/applications/networking/feedreaders/newsflash/default.nix
index 71836c382e89..020bee01c8c8 100644
--- a/pkgs/applications/networking/feedreaders/newsflash/default.nix
+++ b/pkgs/applications/networking/feedreaders/newsflash/default.nix
@@ -5,10 +5,12 @@
 , meson
 , ninja
 , pkg-config
-, wrapGAppsHook
+, wrapGAppsHook4
 , gdk-pixbuf
 , glib
-, gtk3
+, gtk4
+, libadwaita
+, libxml2
 , libhandy
 , openssl
 , sqlite
@@ -21,19 +23,19 @@
 
 stdenv.mkDerivation rec {
   pname = "newsflash";
-  version = "1.5.1";
+  version = "2.0.1";
 
   src = fetchFromGitLab {
     owner = "news-flash";
     repo = "news_flash_gtk";
-    rev = version;
-    hash = "sha256-fLG7oYt+gdl3Lwnu6c7VLJWSHCFY5LyNeDKoUNGg3Yw=";
+    rev = "v.${version}";
+    hash = "sha256-bqS9jq1rUOkYilWzp0e2tlEcgmoc+DUV7+LJ82Bid98=";
   };
 
   cargoDeps = rustPlatform.fetchCargoTarball {
     inherit src;
     name = "${pname}-${version}";
-    hash = "sha256-dQlbK3SfY6p1xinroXz5wcaBbq2LuDM9sMlfJ6ueTTg=";
+    hash = "sha256-vD880Ccp+U4kz7/JbJ850M/XxCb1ypycd2Xm9NHDVRY=";
   };
 
   patches = [
@@ -53,7 +55,7 @@ stdenv.mkDerivation rec {
     meson
     ninja
     pkg-config
-    wrapGAppsHook
+    wrapGAppsHook4
 
     # Provides setup hook to fix "Unrecognized image file format"
     gdk-pixbuf
@@ -67,7 +69,9 @@ stdenv.mkDerivation rec {
   ]);
 
   buildInputs = [
-    gtk3
+    gtk4
+    libadwaita
+    libxml2
     libhandy
     openssl
     sqlite
@@ -99,5 +103,6 @@ stdenv.mkDerivation rec {
     license = licenses.gpl3Plus;
     maintainers = with maintainers; [ kira-bruneau stunkymonkey ];
     platforms = platforms.unix;
+    mainProgram = "com.gitlab.newsflash";
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3bf6034c0a93..15b1b4cb1658 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -30079,7 +30079,9 @@ with pkgs;
 
   nerd-font-patcher = callPackage ../applications/misc/nerd-font-patcher { };
 
-  newsflash = callPackage ../applications/networking/feedreaders/newsflash { };
+  newsflash = callPackage ../applications/networking/feedreaders/newsflash {
+    webkitgtk = webkitgtk_5_0;
+  };
 
   nicotine-plus = callPackage ../applications/networking/soulseek/nicotine-plus { };