From ead87baa84f0b5c2ee8e7095208bd861073dea74 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sat, 24 Dec 2022 12:19:41 +0100
Subject: [PATCH 1/2] libshumate: Fix test after gtk4 4.8.3 bump
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

GTK will crash during tests, likely due to refactored A11Y bus connection:

(/build/source/build/tests/marker-layer:1261): Gtk-WARNING **: 17:18:22.907: Unable to acquire session bus: Cannot spawn a message bus without a machine-id: Unable to load /nix/store/61qy7d70070djqcg135l22v18a5py758-glib-2.74.3/var/lib/dbus/machine-id or /etc/machine-id: Failed to open file “/nix/store/61qy7d70070djqcg135l22v18a5py758-glib-2.74.3/var/lib/dbus/machine-id”: No such file or directory
---
 pkgs/development/libraries/libshumate/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/libshumate/default.nix b/pkgs/development/libraries/libshumate/default.nix
index 2d7e6c5fb7a2..4164ef4a46f8 100644
--- a/pkgs/development/libraries/libshumate/default.nix
+++ b/pkgs/development/libraries/libshumate/default.nix
@@ -61,7 +61,10 @@ stdenv.mkDerivation rec {
   checkPhase = ''
     runHook preCheck
 
-    HOME=$TMPDIR xvfb-run meson test --print-errorlogs
+    env \
+      HOME="$TMPDIR" \
+      GTK_A11Y=none \
+      xvfb-run meson test --print-errorlogs
 
     runHook postCheck
   '';

From 5851a072a5bafb1c48223f57069468cf3811593f Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sat, 24 Dec 2022 12:21:05 +0100
Subject: [PATCH 2/2] gtksourceview5: Fix test after gtk4 4.8.3 bump

GTK will crash during tests, likely due to refactored A11Y bus connection:

(/build/gtksourceview-5.6.1/build/testsuite/test-vim-state:4396): Gtk-WARNING **: 11:15:49.944: Unable to acquire the address of the accessibility bus: GDBus.Error:org.freedesktop.DBus.Error.ServiceUnknown: The name org.a11y.Bus was not provided by any .service files. If you are attempting to run GTK without a11y support, GTK_A11Y should be set to 'none'.
---
 pkgs/development/libraries/gtksourceview/5.x.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/gtksourceview/5.x.nix b/pkgs/development/libraries/gtksourceview/5.x.nix
index 97cb693e3547..d3ac8246d95e 100644
--- a/pkgs/development/libraries/gtksourceview/5.x.nix
+++ b/pkgs/development/libraries/gtksourceview/5.x.nix
@@ -86,10 +86,12 @@ stdenv.mkDerivation rec {
   checkPhase = ''
     runHook preCheck
 
-    XDG_DATA_DIRS="$XDG_DATA_DIRS:${shared-mime-info}/share" \
-    xvfb-run -s '-screen 0 800x600x24' dbus-run-session \
-      --config-file=${dbus}/share/dbus-1/session.conf \
-      meson test --no-rebuild --print-errorlogs
+    env \
+      XDG_DATA_DIRS="$XDG_DATA_DIRS:${shared-mime-info}/share" \
+      GTK_A11Y=none \
+      xvfb-run -s '-screen 0 800x600x24' dbus-run-session \
+        --config-file=${dbus}/share/dbus-1/session.conf \
+        meson test --no-rebuild --print-errorlogs
 
     runHook postCheck
   '';