From e2b522ca015ce1e76232f690c37a3bc5fc717f1f Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Mon, 22 Nov 2021 18:45:32 +0000
Subject: [PATCH] =?UTF-8?q?libhandy:=201.4.0=20=E2=86=92=201.5.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://ftp.gnome.org/pub/GNOME/sources/libhandy/1.5/libhandy-1.5.0.news

Adds style manager but unlike with libadwaita, it is opt-in so existing apps should not be affected:
https://gitlab.gnome.org/GNOME/libhandy/-/merge_requests/782#note_1257929
---
 .../libraries/libhandy/default.nix            | 32 +++++++++++++------
 1 file changed, 23 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/libraries/libhandy/default.nix b/pkgs/development/libraries/libhandy/default.nix
index bb4b03515eda..0744ae30f344 100644
--- a/pkgs/development/libraries/libhandy/default.nix
+++ b/pkgs/development/libraries/libhandy/default.nix
@@ -9,10 +9,11 @@
 , gtk-doc
 , docbook-xsl-nons
 , docbook_xml_dtd_43
+, glib
+, gsettings-desktop-schemas
 , gtk3
 , enableGlade ? false
 , glade
-, dbus
 , xvfb-run
 , libxml2
 , gdk-pixbuf
@@ -27,7 +28,7 @@
 
 stdenv.mkDerivation rec {
   pname = "libhandy";
-  version = "1.4.0";
+  version = "1.5.0";
 
   outputs = [
     "out"
@@ -40,7 +41,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "sha256-JnbVH6H6QP3udJfT52P++hiwM4v/zS7jLn9+YzyIVEY=";
+    sha256 = "sha256-RmueAmwfnrO2WWb1MNl3A6ghLar5EXSMFF6cuEPb1v4=";
   };
 
   nativeBuildInputs = [
@@ -64,7 +65,6 @@ stdenv.mkDerivation rec {
   ];
 
   checkInputs = [
-    dbus
     xvfb-run
     at-spi2-atk
     at-spi2-core
@@ -84,12 +84,26 @@ stdenv.mkDerivation rec {
   doCheck = !stdenv.isDarwin;
 
   checkPhase = ''
-    NO_AT_BRIDGE=1 \
-    XDG_DATA_DIRS="$XDG_DATA_DIRS:${hicolor-icon-theme}/share" \
-    GDK_PIXBUF_MODULE_FILE="${librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache" \
-    xvfb-run -s '-screen 0 800x600x24' dbus-run-session \
-      --config-file=${dbus.daemon}/share/dbus-1/session.conf \
+    runHook preCheck
+
+    testEnvironment=(
+      # Disable portal since we cannot run it in tests.
+      HDY_DISABLE_PORTAL=1
+
+      "XDG_DATA_DIRS=${lib.concatStringsSep ":" [
+        # HdySettings needs to be initialized from “org.gnome.desktop.interface” GSettings schema when portal is not used for color scheme.
+        # It will not actually be used since the “color-scheme” key will only have been introduced in GNOME 42, falling back to detecting theme name.
+        # See hdy_settings_constructed function in https://gitlab.gnome.org/GNOME/libhandy/-/commit/bb68249b005c445947bfb2bee66c91d0fe9c41a4
+        "${glib.getSchemaPath gsettings-desktop-schemas}/../.."
+
+        # Some tests require icons
+        "${hicolor-icon-theme}/share"
+      ]}"
+    )
+    env "''${testEnvironment[@]}" xvfb-run \
       meson test --print-errorlogs
+
+    runHook postCheck
   '';
 
   passthru = {