From 574ab12c16e1d653f55f035d41f9a1565c0f5c7c Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Sat, 30 May 2026 20:21:20 +0200
Subject: [PATCH 1/5] gtk-server: remove unused configurationOptions

This looks like a typo for `configureFlags` and was never used?

After removing it the build still reports `Use GTK 3.x backend: YES`,
so I suppose it would just pick up whichever version of gtk we provided anyway.
---
 pkgs/by-name/gt/gtk-server/package.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/by-name/gt/gtk-server/package.nix b/pkgs/by-name/gt/gtk-server/package.nix
index 1c45fa07bbc1..1071eef1a5d7 100644
--- a/pkgs/by-name/gt/gtk-server/package.nix
+++ b/pkgs/by-name/gt/gtk-server/package.nix
@@ -32,8 +32,6 @@ stdenv.mkDerivation (finalAttrs: {
     gtk3
   ];
 
-  configureOptions = [ "--with-gtk3" ];
-
   meta = {
     homepage = "http://www.gtk-server.org/";
     description = "Gtk-server for interpreted GUI programming";

From 6b4232410f26164bc9d88c3281b7c6cea2cb8b52 Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Sat, 30 May 2026 21:02:47 +0200
Subject: [PATCH 2/5] gtk-server: 2.4.6 -> 2.4.7

---
 pkgs/by-name/gt/gtk-server/package.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/gt/gtk-server/package.nix b/pkgs/by-name/gt/gtk-server/package.nix
index 1071eef1a5d7..ab8ccafcda25 100644
--- a/pkgs/by-name/gt/gtk-server/package.nix
+++ b/pkgs/by-name/gt/gtk-server/package.nix
@@ -11,11 +11,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gtk-server";
-  version = "2.4.6";
+  version = "2.4.7";
 
   src = fetchurl {
     url = "https://www.gtk-server.org/stable/gtk-server-${finalAttrs.version}.tar.gz";
-    sha256 = "sha256-sFL3y068oXDKgkEUcNnGVsNSPBdI1NzpsqdYJfmOQoA=";
+    hash = "sha256-YRvnE4fH5jWITSiMUbtlaOJFKAW0/Alzo1YVDlm8CO8=";
   };
 
   preConfigure = ''
@@ -35,6 +35,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     homepage = "http://www.gtk-server.org/";
     description = "Gtk-server for interpreted GUI programming";
+    changelog = "http://www.gtk-server.org/notes.txt";
     license = lib.licenses.gpl2Plus;
     maintainers = [ ];
     platforms = lib.platforms.linux;

From cbea254e5d1624c8c223581d433b3d87321d37c8 Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Sat, 30 May 2026 21:04:31 +0200
Subject: [PATCH 3/5] gtk-server: use gtk4

This is now possible with then new 2.4.7 release
---
 pkgs/by-name/gt/gtk-server/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/gt/gtk-server/package.nix b/pkgs/by-name/gt/gtk-server/package.nix
index ab8ccafcda25..c9c247244ee7 100644
--- a/pkgs/by-name/gt/gtk-server/package.nix
+++ b/pkgs/by-name/gt/gtk-server/package.nix
@@ -3,10 +3,10 @@
   stdenv,
   fetchurl,
   glib,
-  gtk3,
+  gtk4,
   libffcall,
   pkg-config,
-  wrapGAppsHook3,
+  wrapGAppsHook4,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -24,12 +24,12 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [
     pkg-config
-    wrapGAppsHook3
+    wrapGAppsHook4
   ];
   buildInputs = [
     libffcall
     glib
-    gtk3
+    gtk4
   ];
 
   meta = {

From b3a09ea15d6b468cfd2cead2e3e1119e4242a6cf Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Sat, 30 May 2026 21:32:17 +0200
Subject: [PATCH 4/5] gtk-server: add meta.mainProgram

---
 pkgs/by-name/gt/gtk-server/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/gt/gtk-server/package.nix b/pkgs/by-name/gt/gtk-server/package.nix
index c9c247244ee7..db0708952716 100644
--- a/pkgs/by-name/gt/gtk-server/package.nix
+++ b/pkgs/by-name/gt/gtk-server/package.nix
@@ -39,5 +39,6 @@ stdenv.mkDerivation (finalAttrs: {
     license = lib.licenses.gpl2Plus;
     maintainers = [ ];
     platforms = lib.platforms.linux;
+    mainProgram = "gtk-server";
   };
 })

From ebc7fc9d0fbc867595b228795627c12f11e85573 Mon Sep 17 00:00:00 2001
From: Sandro <sandro.jaeckel@gmail.com>
Date: Wed, 10 Jun 2026 02:01:11 +0200
Subject: [PATCH 5/5] gtk-server: use https in links in meta

---
 pkgs/by-name/gt/gtk-server/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/gt/gtk-server/package.nix b/pkgs/by-name/gt/gtk-server/package.nix
index db0708952716..78bfeba8a677 100644
--- a/pkgs/by-name/gt/gtk-server/package.nix
+++ b/pkgs/by-name/gt/gtk-server/package.nix
@@ -33,9 +33,9 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   meta = {
-    homepage = "http://www.gtk-server.org/";
+    homepage = "https://www.gtk-server.org/";
     description = "Gtk-server for interpreted GUI programming";
-    changelog = "http://www.gtk-server.org/notes.txt";
+    changelog = "https://www.gtk-server.org/notes.txt";
     license = lib.licenses.gpl2Plus;
     maintainers = [ ];
     platforms = lib.platforms.linux;