From 5d15a099b94be16ee619053ed6bcbddefd561a19 Mon Sep 17 00:00:00 2001
From: Maxine Aubrey <maxeaubrey@gmail.com>
Date: Fri, 13 May 2022 22:54:42 +0200
Subject: [PATCH 1/2] gtk4: patch fixing g-c-c crashes

---
 pkgs/development/libraries/gtk/4.x.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/development/libraries/gtk/4.x.nix b/pkgs/development/libraries/gtk/4.x.nix
index e59e471a51e..a93459c1f87 100644
--- a/pkgs/development/libraries/gtk/4.x.nix
+++ b/pkgs/development/libraries/gtk/4.x.nix
@@ -2,6 +2,7 @@
 , stdenv
 , substituteAll
 , fetchurl
+, fetchpatch
 , pkg-config
 , gettext
 , graphene
@@ -77,6 +78,15 @@ stdenv.mkDerivation rec {
     sha256 = "pXrNDkSCmBcA/fhllsdBPLYe9H915HR/2oCegjG42Ww=";
   };
 
+  patches = [
+    # Fix GNOME Control Center crash.
+    # https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/4670
+    (fetchpatch {
+      url = "https://gitlab.gnome.org/GNOME/gtk/-/commit/ae0166973795e750f08b89f9f0ef974d7ac48bc7.patch";
+      sha256 = "qPOplocE+RcTFIEveJe8YLKiUpe7o6CiA834rZpS0Fs=";
+    })
+  ];
+
   nativeBuildInputs = [
     gettext
     gobject-introspection

From 20c371f91e48412ca219c1c7b5249da4ead329bc Mon Sep 17 00:00:00 2001
From: Maxine Aubrey <maxeaubrey@gmail.com>
Date: Fri, 13 May 2022 22:57:22 +0200
Subject: [PATCH 2/2] gtk3: 3.24.33 -> 3.24.33-2022-03-11

---
 pkgs/development/libraries/gtk/3.x.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/gtk/3.x.nix b/pkgs/development/libraries/gtk/3.x.nix
index 5e0dcf6ce03..82332840e48 100644
--- a/pkgs/development/libraries/gtk/3.x.nix
+++ b/pkgs/development/libraries/gtk/3.x.nix
@@ -1,7 +1,7 @@
 { lib
 , stdenv
 , substituteAll
-, fetchurl
+, fetchzip
 , pkg-config
 , gettext
 , docbook-xsl-nons
@@ -60,7 +60,7 @@ in
 
 stdenv.mkDerivation rec {
   pname = "gtk+3";
-  version = "3.24.33";
+  version = "3.24.33-2022-03-11";
 
   outputs = [ "out" "dev" ] ++ lib.optional withGtkDoc "devdoc";
   outputBin = "dev";
@@ -70,9 +70,9 @@ stdenv.mkDerivation rec {
     gtkCleanImmodulesCache
   ];
 
-  src = fetchurl {
-    url = "mirror://gnome/sources/gtk+/${lib.versions.majorMinor version}/gtk+-${version}.tar.xz";
-    sha256 = "sha256-WIsGUi4l0VeemJtvnYob2/L+E83gGgTpBP80aiJeeAE=";
+  src = fetchzip {
+    url = "https://gitlab.gnome.org/GNOME/gtk/-/archive/9d1d2f0a6643570274121fc1473e46a6edc2e32d/gtk-9d1d2f0a6643570274121fc1473e46a6edc2e32d.tar.gz";
+    sha256 = "sha256-+K1Kp3Sklrj/Ly0pSktfQwfcrIKpbf05NQbMDhWJZNI=";
   };
 
   patches = [