From 05bfbc995173790892988b5aa00c5b07117e66c5 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 7 Aug 2022 17:12:11 +0000
Subject: [PATCH] =?UTF-8?q?gnome-console:=2042.2=20=E2=86=92=2043.beta?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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

diff --git a/pkgs/applications/terminal-emulators/gnome-console/default.nix b/pkgs/applications/terminal-emulators/gnome-console/default.nix
index 92bf1749e80e..adb4bc577100 100644
--- a/pkgs/applications/terminal-emulators/gnome-console/default.nix
+++ b/pkgs/applications/terminal-emulators/gnome-console/default.nix
@@ -1,75 +1,49 @@
 { lib
 , stdenv
 , fetchurl
-, fetchpatch
 , gettext
 , gnome
 , libgtop
-, gtk3
-, libhandy
+, gtk4
+, libadwaita
 , pcre2
-, vte
+, vte-gtk4
 , appstream-glib
 , desktop-file-utils
-, git
 , meson
 , ninja
 , pkg-config
 , python3
-, sassc
-, wrapGAppsHook
+, wrapGAppsHook4
 , nixosTests
 }:
 
 stdenv.mkDerivation rec {
   pname = "gnome-console";
-  version = "42.2";
+  version = "43.beta";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-console/${lib.versions.major version}/${pname}-${version}.tar.xz";
-    sha256 = "fSbmwYdExXWnhykyY/YM7/YwEHCY6eWKd2WwCsdDcEk=";
+    sha256 = "t4TcSBVe86AkzYij9/650JO9mcZfKpcVo3+fu7Wq8VY=";
   };
 
-  patches = [
-    (fetchpatch {
-      name = "fix-clang-build-issues.patch";
-      url = "https://gitlab.gnome.org/GNOME/console/-/commit/0e29a417d52e27da62f5cac461400be6a764dc65.patch";
-      sha256 = "sha256-5ORNZOxjC5dMk9VKaBcJu5OV1SEZo9SNUbN4Ob5hVJs=";
-    })
-
-    # Fix Nautilus extension in 43.
-    # https://gitlab.gnome.org/GNOME/console/-/merge_requests/104
-    (fetchpatch {
-      url = "https://gitlab.gnome.org/GNOME/console/-/commit/e0131faeabdce95bfe1ea260b1ed439120abf1db.patch";
-      sha256 = "56lw/lTshVVda31ohcS8j38JL4UwyvtmSLEYkUMYylY=";
-    })
-  ];
-
   buildInputs = [
     gettext
     libgtop
-    gtk3
-    libhandy
+    gtk4
+    libadwaita
     pcre2
-    vte
-  ] ++ lib.optionals stdenv.isLinux [
-    gnome.nautilus
+    vte-gtk4
   ];
 
   nativeBuildInputs = [
     appstream-glib
     desktop-file-utils
-    git
     meson
     ninja
     pkg-config
     python3
-    sassc
-    wrapGAppsHook
-  ];
-
-  mesonFlags = lib.optionals (!stdenv.isLinux) [
-    "-Dnautilus=disabled"
+    wrapGAppsHook4
   ];
 
   passthru = {