From efe902542a1a4e514e7d3c075c6f671594e9e68e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kasper=20Ga=C5=82kowski?= <k@galkowski.xyz>
Date: Thu, 2 Mar 2023 21:12:47 +0100
Subject: [PATCH] sbclPackages.cl-gtk4: update to tip of trunk

Makes latest examples from upstream work
---
 pkgs/development/lisp-modules/packages.nix | 44 ++++++++++++++++++----
 1 file changed, 36 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/lisp-modules/packages.nix b/pkgs/development/lisp-modules/packages.nix
index 73e33e26111b..2fc10bbc35a6 100644
--- a/pkgs/development/lisp-modules/packages.nix
+++ b/pkgs/development/lisp-modules/packages.nix
@@ -434,19 +434,47 @@ let
     patches = [ ./patches/magicl-dont-build-fortran-twice.patch ];
   };
 
+  cl-glib = build-asdf-system {
+    pname = "cl-glib";
+    version = "1.0.0";
+    src = pkgs.fetchFromGitHub {
+      owner = "bohonghuang";
+      repo = "cl-glib";
+      rev = "84b128192d6b11cf03f1150e474a23368f07edff";
+      hash = "sha256-A56Yz+W4n1rAxxZg15zfkrLMbKMEG/zsWqaX7+kx4Qg=";
+    };
+    lispLibs = with super; [
+      cl-gobject-introspection-wrapper
+      bordeaux-threads
+    ];
+  };
+
+  cl-glib_dot_gio = build-asdf-system {
+    pname = "cl-glib.gio";
+    version = "1.0.0";
+    src = pkgs.fetchFromGitHub {
+      owner = "bohonghuang";
+      repo = "cl-glib";
+      rev = "84b128192d6b11cf03f1150e474a23368f07edff";
+      hash = "sha256-A56Yz+W4n1rAxxZg15zfkrLMbKMEG/zsWqaX7+kx4Qg=";
+    };
+    lispLibs = with super; [
+      cl-gobject-introspection-wrapper
+    ];
+  };
+
   cl-gtk4 = build-asdf-system {
     pname = "cl-gtk4";
     version = "1.0.0";
     src = pkgs.fetchFromGitHub {
       owner = "bohonghuang";
       repo = "cl-gtk4";
-      rev = "6e11b0d92ccf7cacee5c7f03d50148d68fe8e04d";
-      hash = "sha256-d/DYV1aQAir4mszsw1wEotxxBW9jGiFjELB04/PRBQ4=";
+      rev = "e18f621b996fd986d9829d590203c690440dee64";
+      hash = "sha256-++qydw6db4O3m+DAjutVPN8IuePOxseo9vhWEvwiR6E=";
     };
     lispLibs = with super; [
       cl-gobject-introspection-wrapper
-      cl-glib_dot_gio
-    ];
+    ] ++ [ self.cl-glib self.cl-glib_dot_gio ];
     nativeBuildInputs = [
       pkgs.gobject-introspection
       pkgs.gtk4
@@ -462,8 +490,8 @@ let
     src = pkgs.fetchFromGitHub {
       owner = "bohonghuang";
       repo = "cl-gtk4";
-      rev = "6e11b0d92ccf7cacee5c7f03d50148d68fe8e04d";
-      hash = "sha256-d/DYV1aQAir4mszsw1wEotxxBW9jGiFjELB04/PRBQ4=";
+      rev = "e18f621b996fd986d9829d590203c690440dee64";
+      hash = "sha256-++qydw6db4O3m+DAjutVPN8IuePOxseo9vhWEvwiR6E=";
     };
     lispLibs = with super; [
       cl-gobject-introspection-wrapper
@@ -482,8 +510,8 @@ let
     src = pkgs.fetchFromGitHub {
       owner = "bohonghuang";
       repo = "cl-gtk4";
-      rev = "6e11b0d92ccf7cacee5c7f03d50148d68fe8e04d";
-      hash = "sha256-d/DYV1aQAir4mszsw1wEotxxBW9jGiFjELB04/PRBQ4=";
+      rev = "e18f621b996fd986d9829d590203c690440dee64";
+      hash = "sha256-++qydw6db4O3m+DAjutVPN8IuePOxseo9vhWEvwiR6E=";
     };
     lispLibs = with super; [
       cl-gobject-introspection-wrapper