cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

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

Browse source 
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>
This commit is contained in:
Bobby Rong 2023-08-07 07:54:29 +00:00 committed by Jan Tojnar
parent 10470e5523
commit 3bdcdae69d
3 changed files with 14 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
nixos/modules/services/desktops/gnome/gnome-initial-setup.nix
View file

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

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

@ -17,11 +17,11 @@ index 196abf6..613d0e5 100644
return TRUE; return TRUE;
if (variant[0]) 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 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_spawn_command_line_async (commandline, NULL);
g_free (commandline); 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 index a2376f8..5cb7bc9 100644
--- a/gnome-initial-setup/pages/timezone/tz.h --- a/gnome-initial-setup/pages/timezone/tz.h
+++ b/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 @@ @@ -28,7 +28,7 @@
G_BEGIN_DECLS G_BEGIN_DECLS

11
pkgs/desktops/gnome/core/gnome-initial-setup/default.nix
View file

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