From 184fe6a337f362dfe4354f5e073478181c81b07c Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sat, 19 Feb 2022 08:13:38 +0100
Subject: [PATCH] =?UTF-8?q?gnome-console:=20unstable-2021-03-13=20?=
 =?UTF-8?q?=E2=86=92=2042.beta?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/console/-/compare/105adb6a8d09418a3ce622442aef6ae623dee787...42.beta
---
 .../gnome-console/default.nix                 | 38 +++++++------------
 1 file changed, 14 insertions(+), 24 deletions(-)

diff --git a/pkgs/applications/terminal-emulators/gnome-console/default.nix b/pkgs/applications/terminal-emulators/gnome-console/default.nix
index 1be9412e8da..9b4b460550f 100644
--- a/pkgs/applications/terminal-emulators/gnome-console/default.nix
+++ b/pkgs/applications/terminal-emulators/gnome-console/default.nix
@@ -1,7 +1,6 @@
 { lib
 , stdenv
-, genericBranding ? false
-, fetchFromGitLab
+, fetchurl
 , gettext
 , gnome
 , libgtop
@@ -21,16 +20,13 @@
 , nixosTests
 }:
 
-stdenv.mkDerivation {
-  pname = "kgx";
-  version = "unstable-2021-03-13";
+stdenv.mkDerivation rec {
+  pname = "gnome-console";
+  version = "42.beta";
 
-  src = fetchFromGitLab {
-    domain = "gitlab.gnome.org";
-    owner = "ZanderBrown";
-    repo = "kgx";
-    rev = "105adb6a8d09418a3ce622442aef6ae623dee787";
-    sha256 = "0m34y0nbcfkyicb40iv0iqaq6f9r3f66w43lr803j3351nxqvcz2";
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-console/${lib.versions.major version}/${pname}-${version}.tar.xz";
+    sha256 = "Lq/shyAhDcwB5HqpihvGx2+xwVU2Xax7/NerFwR36DQ=";
   };
 
   buildInputs = [
@@ -55,25 +51,19 @@ stdenv.mkDerivation {
     wrapGAppsHook
   ];
 
-  mesonFlags = lib.optional genericBranding "-Dgeneric=true";
-
-  postPatch = ''
-    chmod +x build-aux/meson/postinstall.py
-    patchShebangs build-aux/meson/postinstall.py
-  '';
-
-  preFixup = ''
-    substituteInPlace $out/share/applications/org.gnome.zbrown.KingsCross.desktop \
-      --replace "Exec=kgx" "Exec=$out/bin/kgx"
-  '';
+  passthru = {
+    updateScript = gnome.updateScript {
+      packageName = pname;
+    };
+  };
 
   passthru.tests.test = nixosTests.terminal-emulators.kgx;
 
   meta = with lib; {
     description = "Simple user-friendly terminal emulator for the GNOME desktop";
-    homepage = "https://gitlab.gnome.org/ZanderBrown/kgx";
+    homepage = "https://gitlab.gnome.org/GNOME/console";
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ zhaofengli ];
+    maintainers = teams.gnome.members ++ (with maintainers; [ zhaofengli ]);
     platforms = platforms.linux;
   };
 }