gnome.gnome-initial-setup: 44.0 → 45.beta

https://gitlab.gnome.org/GNOME/gnome-initial-setup/-/compare/44.0...45.beta

Install dconf presets: 0c607f104e

Use tecla: 3dcb8709ba

Changelog-reviewed-by: Bobby Rong <rjl931189261@126.com>
Changelog-reviewed-by: Jan Tojnar <jtojnar@gmail.com>

nixos/modules/services/desktops/gnome/gnome-initial-setup.nix

@@ -93,6 +93,9 @@ in
       "gnome-initial-setup.service"
     ];
 
+    programs.dconf.profiles.gnome-initial-setup.databases = [
+      "${pkgs.gnome.gnome-initial-setup}/share/gnome-initial-setup/initial-setup-dconf-defaults"
+    ];
   };
 
 }

pkgs/desktops/gnome/core/gnome-initial-setup/0001-fix-paths.patch

@@ -17,11 +17,11 @@ index 196abf6..613d0e5 100644
  		return TRUE;
  
  	if (variant[0])
--		commandline = g_strdup_printf ("gkbd-keyboard-display -l \"%s\t%s\"", layout, variant);
+-		commandline = g_strdup_printf ("tecla \"%s+%s\"", layout, variant);
-+		commandline = g_strdup_printf ("@libgnomekbd@/bin/gkbd-keyboard-display -l \"%s\t%s\"", layout, variant);
++		commandline = g_strdup_printf ("@tecla@/bin/tecla \"%s+%s\"", layout, variant);
  	else
--		commandline = g_strdup_printf ("gkbd-keyboard-display -l %s", layout);
+-		commandline = g_strdup_printf ("tecla %s", layout);
-+		commandline = g_strdup_printf ("@libgnomekbd@/bin/gkbd-keyboard-display -l %s", layout);
++		commandline = g_strdup_printf ("@tecla@/bin/tecla %s", layout);
  	g_spawn_command_line_async (commandline, NULL);
  	g_free (commandline);
  
@@ -38,15 +38,6 @@ diff --git a/gnome-initial-setup/pages/timezone/tz.h b/gnome-initial-setup/pages
 index a2376f8..5cb7bc9 100644
 --- a/gnome-initial-setup/pages/timezone/tz.h
 +++ b/gnome-initial-setup/pages/timezone/tz.h
-@@ -4,7 +4,7 @@
-  * Copyright (C) 2000-2001 Ximian, Inc.
-  *
-  * Authors: Hans Petter Jansson <hpj@ximian.com>
-- * 
-+ *
-  * Largely based on Michael Fulbright's work on Anaconda.
-  *
-  * This program is free software; you can redistribute it and/or modify
 @@ -28,7 +28,7 @@
  G_BEGIN_DECLS
  

pkgs/desktops/gnome/core/gnome-initial-setup/default.nix

@@ -2,6 +2,7 @@
 , lib
 , fetchurl
 , substituteAll
+, dconf
 , gettext
 , meson
 , ninja
@@ -32,27 +33,29 @@
 , libadwaita
 , libnma-gtk4
 , tzdata
-, libgnomekbd
+, gnome-tecla
 , gsettings-desktop-schemas
 }:
 
 stdenv.mkDerivation rec {
   pname = "gnome-initial-setup";
-  version = "44.0";
+  version = "45.beta";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
-    sha256 = "WTz8bcj4KphnG5TANbl9vojvVucIeAsq0dIyTk0Eu/8=";
+    sha256 = "LK9/kq/ojZ2Hw2sc3i4zS04A6XO0UFg5Omo8EPUOBmY=";
   };
 
   patches = [
     (substituteAll {
       src = ./0001-fix-paths.patch;
-      inherit tzdata libgnomekbd;
+      inherit tzdata;
+      tecla = gnome-tecla;
     })
   ];
 
   nativeBuildInputs = [
+    dconf
     gettext
     meson
     ninja