From f6532d2caf6ac2065ac8af308ec5e418ba6d6aae Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Thu, 21 Sep 2023 14:50:50 +0000
Subject: [PATCH] =?UTF-8?q?gnome.dconf-editor:=2043.0=20=E2=86=92=2045.0.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/dconf-editor/-/compare/43.0...45.0.1

- Ensure a type is available for ui file.
- Support multiple paths in GSETTINGS_SCHEMA_DIR environment variable.
  Not changing NIX_GSETTINGS_OVERRIDES_DIR patch since the glib patch
  does not support multiple directories.
- Use Meson’s post install mechanism.

https://github.com/GNOME/dconf-editor/commit/9643dbba76f844adab25ca8d1ee0c224ff99ab19

Changelog-reviewed-by: Bobby Rong <rjl931189261@126.com>
Changelog-reviewed-by: Jan Tojnar <jtojnar@gmail.com>
Co-authored-by: Jan Tojnar <jtojnar@gmail.com>
---
 .../gnome/core/dconf-editor/default.nix       | 19 ++++++++++---------
 .../schema-override-variable.patch            |  4 ++--
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/pkgs/desktops/gnome/core/dconf-editor/default.nix b/pkgs/desktops/gnome/core/dconf-editor/default.nix
index d6da42ab5508..4da661748c95 100644
--- a/pkgs/desktops/gnome/core/dconf-editor/default.nix
+++ b/pkgs/desktops/gnome/core/dconf-editor/default.nix
@@ -2,6 +2,7 @@
 , stdenv
 , fetchurl
 , fetchpatch
+, desktop-file-utils
 , meson
 , ninja
 , vala
@@ -11,7 +12,6 @@
 , gtk3
 , libhandy
 , gnome
-, python3
 , dconf
 , libxml2
 , gettext
@@ -22,20 +22,27 @@
 
 stdenv.mkDerivation rec {
   pname = "dconf-editor";
-  version = "43.0";
+  version = "45.0.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
-    sha256 = "sha256-k1o8Lddswqk81a7ppU05R/sRHrOW9LY9xfC6j40JkTY=";
+    sha256 = "sha256-EYApdnju2uYhfMUUomOMGH0vHR7ycgy5B5t0DEKZQd0=";
   };
 
   patches = [
+    # Fix crash with GSETTINGS_SCHEMA_DIR env var.
+    (fetchpatch {
+      url = "https://gitlab.gnome.org/GNOME/dconf-editor/-/commit/baf183737d459dcde065c9f8f6fe5be7ed874de6.patch";
+      hash = "sha256-Vp0qjJChDr6IarUD+tZPLJhdI8v8r6EzWNfqFSnGvqQ=";
+    })
+
     # Look for compiled schemas in NIX_GSETTINGS_OVERRIDES_DIR
     # environment variable, to match what we patched GLib to do.
     ./schema-override-variable.patch
   ];
 
   nativeBuildInputs = [
+    desktop-file-utils
     meson
     ninja
     vala
@@ -46,7 +53,6 @@ stdenv.mkDerivation rec {
     docbook-xsl-nons
     libxml2
     gobject-introspection
-    python3
   ];
 
   buildInputs = [
@@ -56,11 +62,6 @@ stdenv.mkDerivation rec {
     dconf
   ];
 
-  postPatch = ''
-    chmod +x meson_post_install.py
-    patchShebangs meson_post_install.py
-  '';
-
   passthru = {
     updateScript = gnome.updateScript {
       packageName = pname;
diff --git a/pkgs/desktops/gnome/core/dconf-editor/schema-override-variable.patch b/pkgs/desktops/gnome/core/dconf-editor/schema-override-variable.patch
index feaa604e5b67..06896d1aa4ee 100644
--- a/pkgs/desktops/gnome/core/dconf-editor/schema-override-variable.patch
+++ b/pkgs/desktops/gnome/core/dconf-editor/schema-override-variable.patch
@@ -10,5 +10,5 @@ index 27b2b17a..87f7ba86 100644
 +        if (nix_var_schema_dir != null)
 +            source = try_prepend_dir (source, (!) nix_var_schema_dir);
          string? var_schema_dir = GLib.Environment.get_variable ("GSETTINGS_SCHEMA_DIR");
-         if (var_schema_dir != null)
-             source = try_prepend_dir (source, (!) var_schema_dir);
+         if (var_schema_dir != null) {
+             string[] extra_schema_dirs = ((!) var_schema_dir).split (Path.SEARCHPATH_SEPARATOR_S);