From 864ebd79e2662fae936a95b95294dfd6994adda9 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 1 Feb 2023 22:36:42 +0000
Subject: [PATCH] =?UTF-8?q?gnome-console:=2042.2=20=E2=86=92=2043.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Ported to GTK4
- Nautilus plug-in was moved to Nautilus.

https://gitlab.gnome.org/GNOME/console/-/compare/42.2...43.0

Changelog-Reviewed-By: Jan Tojnar <jtojnar@gmail.com>
---
 .../gnome-console/default.nix                 | 52 ++++++-------------
 1 file changed, 15 insertions(+), 37 deletions(-)

diff --git a/pkgs/applications/terminal-emulators/gnome-console/default.nix b/pkgs/applications/terminal-emulators/gnome-console/default.nix
index 85ee654a989a..95c4f0f71541 100644
--- a/pkgs/applications/terminal-emulators/gnome-console/default.nix
+++ b/pkgs/applications/terminal-emulators/gnome-console/default.nix
@@ -1,72 +1,50 @@
 { lib
 , stdenv
 , fetchurl
-, fetchpatch
 , gettext
 , gnome
 , libgtop
-, gtk3
-, libhandy
+, gtk4
+, libadwaita
 , pcre2
-, vte
-, appstream-glib
+, vte-gtk4
 , desktop-file-utils
-, git
 , meson
 , ninja
 , pkg-config
-, python3
-, sassc
-, wrapGAppsHook
+, wrapGAppsHook4
 , nixosTests
 }:
 
 stdenv.mkDerivation rec {
   pname = "gnome-console";
-  # Do not upgrade until https://gitlab.gnome.org/GNOME/vte/-/issues/2584 is resolved!
-  version = "42.2";
+  version = "43.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-console/${lib.versions.major version}/${pname}-${version}.tar.xz";
-    sha256 = "fSbmwYdExXWnhykyY/YM7/YwEHCY6eWKd2WwCsdDcEk=";
+    sha256 = "uWQkhaN6cOgswQVTsOJoF1a6Nh/15MvzGC8VAjH+qZ4=";
   };
 
-  patches = [
-    (fetchpatch {
-      name = "fix-clang-build-issues.patch";
-      url = "https://gitlab.gnome.org/GNOME/console/-/commit/0e29a417d52e27da62f5cac461400be6a764dc65.patch";
-      sha256 = "sha256-5ORNZOxjC5dMk9VKaBcJu5OV1SEZo9SNUbN4Ob5hVJs=";
-    })
-  ];
-
-  buildInputs = [
-    gettext
-    libgtop
-    gtk3
-    libhandy
-    pcre2
-    vte
-  ];
-
   nativeBuildInputs = [
-    appstream-glib
     desktop-file-utils
-    git
+    gettext
     meson
     ninja
     pkg-config
-    python3
-    sassc
-    wrapGAppsHook
+    wrapGAppsHook4
   ];
 
-  mesonFlags = [
-    "-Dnautilus=disabled"
+  buildInputs = [
+    libgtop
+    gtk4
+    libadwaita
+    pcre2
+    vte-gtk4
   ];
 
   passthru = {
     updateScript = gnome.updateScript {
-      packageName = pname;
+      packageName = "gnome-console";
     };
   };