diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2023-12-09 11:18:35 +0000 |
---|---|---|
committer | github-actions[bot] <github-actions[bot]@users.noreply.github.com> | 2023-12-10 10:56:02 +0000 |
commit | 5922b1d8f7477f57de90d88eb2c8141b8defd17f (patch) | |
tree | 1ee6f637de406767423497feabc5fe817a188521 /pkgs/desktops | |
parent | f208aff1b1408b46361565a1a01e3ad571bd1694 (diff) |
gnome.gnome-control-center: 45.1 → 45.2
https://gitlab.gnome.org/GNOME/gnome-control-center/-/compare/45.1...45.2 (cherry picked from commit 3b7892c7292d7d0d113d544fb37e9b600bfd389f)
Diffstat (limited to 'pkgs/desktops')
-rw-r--r-- | pkgs/desktops/gnome/core/gnome-control-center/default.nix | 14 | ||||
-rw-r--r-- | pkgs/desktops/gnome/core/gnome-control-center/paths.patch | 45 |
2 files changed, 28 insertions, 31 deletions
diff --git a/pkgs/desktops/gnome/core/gnome-control-center/default.nix b/pkgs/desktops/gnome/core/gnome-control-center/default.nix index d59b5a1390655..69feddaaa84bf 100644 --- a/pkgs/desktops/gnome/core/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome/core/gnome-control-center/default.nix @@ -66,13 +66,13 @@ , xvfb-run }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gnome-control-center"; - version = "45.1"; + version = "45.2"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-0obHYnFQ4RKqy7S3uRcX+tjokHYGFHnfxhCy3XRLV3o="; + url = "mirror://gnome/sources/gnome-control-center/${lib.versions.major finalAttrs.version}/gnome-control-center-${finalAttrs.version}.tar.xz"; + sha256 = "sha256-DPo8My1u2stz0GxrJv/KEHjob/WerIGbKTHglndT33A="; }; patches = [ @@ -201,8 +201,8 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { - packageName = pname; - attrPath = "gnome.${pname}"; + packageName = "gnome-control-center"; + attrPath = "gnome.gnome-control-center"; }; }; @@ -212,4 +212,4 @@ stdenv.mkDerivation rec { maintainers = teams.gnome.members; platforms = platforms.linux; }; -} +}) diff --git a/pkgs/desktops/gnome/core/gnome-control-center/paths.patch b/pkgs/desktops/gnome/core/gnome-control-center/paths.patch index 165497f11e2a7..be2ca4b5e09e6 100644 --- a/pkgs/desktops/gnome/core/gnome-control-center/paths.patch +++ b/pkgs/desktops/gnome/core/gnome-control-center/paths.patch @@ -38,7 +38,7 @@ index f6c84e3d2..cd897f8f5 100644 else gtk_widget_set_sensitive (self->toolbutton_profile_view, FALSE); diff --git a/panels/datetime/tz.h b/panels/datetime/tz.h -index a2376f8a4..98769e08f 100644 +index feef16580..4b88ef7b1 100644 --- a/panels/datetime/tz.h +++ b/panels/datetime/tz.h @@ -27,11 +27,7 @@ @@ -55,26 +55,23 @@ index a2376f8a4..98769e08f 100644 typedef struct _TzDB TzDB; typedef struct _TzLocation TzLocation; diff --git a/panels/network/connection-editor/net-connection-editor.c b/panels/network/connection-editor/net-connection-editor.c -index 505b8ee25..62e94009f 100644 +index ec5a905a5..689fdbebe 100644 --- a/panels/network/connection-editor/net-connection-editor.c +++ b/panels/network/connection-editor/net-connection-editor.c -@@ -267,9 +267,9 @@ net_connection_editor_do_fallback (NetConnectionEditor *self, const gchar *type) - g_autoptr(GError) error = NULL; +@@ -377,7 +377,7 @@ net_connection_editor_do_fallback (NetConnectionEditor *self, const gchar *type) + GPid child_pid; - if (self->is_new_connection) { -- cmdline = g_strdup_printf ("nm-connection-editor --type='%s' --create", type); -+ cmdline = g_strdup_printf ("@networkmanagerapplet@/bin/nm-connection-editor --type='%s' --create", type); - } else { -- cmdline = g_strdup_printf ("nm-connection-editor --edit='%s'", -+ cmdline = g_strdup_printf ("@networkmanagerapplet@/bin/nm-connection-editor --edit='%s'", - nm_connection_get_uuid (self->connection)); - } + builder = g_strv_builder_new (); +- g_strv_builder_add (builder, "nm-connection-editor"); ++ g_strv_builder_add (builder, "@networkmanagerapplet@/bin/nm-connection-editor"); + if (self->is_new_connection) { + g_autofree gchar *type_str = NULL; diff --git a/panels/network/net-device-bluetooth.c b/panels/network/net-device-bluetooth.c -index 74dfb0e9a..5f53d1a20 100644 +index 303f4a8af..e5afc4dff 100644 --- a/panels/network/net-device-bluetooth.c +++ b/panels/network/net-device-bluetooth.c -@@ -90,7 +90,7 @@ nm_device_bluetooth_refresh_ui (NetDeviceBluetooth *self) +@@ -80,7 +80,7 @@ nm_device_bluetooth_refresh_ui (NetDeviceBluetooth *self) update_off_switch_from_device_state (self->device_off_switch, state, self); /* set up the Options button */ @@ -83,7 +80,7 @@ index 74dfb0e9a..5f53d1a20 100644 gtk_widget_set_visible (GTK_WIDGET (self->options_button), state != NM_DEVICE_STATE_UNMANAGED && path != NULL); } -@@ -141,7 +141,7 @@ options_button_clicked_cb (NetDeviceBluetooth *self) +@@ -131,7 +131,7 @@ options_button_clicked_cb (NetDeviceBluetooth *self) connection = net_device_get_find_connection (self->client, self->device); uuid = nm_connection_get_uuid (connection); @@ -92,7 +89,7 @@ index 74dfb0e9a..5f53d1a20 100644 g_debug ("Launching '%s'\n", cmdline); if (!g_spawn_command_line_async (cmdline, &error)) g_warning ("Failed to launch nm-connection-editor: %s", error->message); -@@ -185,7 +185,7 @@ net_device_bluetooth_init (NetDeviceBluetooth *self) +@@ -173,7 +173,7 @@ net_device_bluetooth_init (NetDeviceBluetooth *self) gtk_widget_init_template (GTK_WIDGET (self)); @@ -102,10 +99,10 @@ index 74dfb0e9a..5f53d1a20 100644 } diff --git a/panels/network/net-device-mobile.c b/panels/network/net-device-mobile.c -index 34eb86241..50d0a2bed 100644 +index 166670224..36f720d36 100644 --- a/panels/network/net-device-mobile.c +++ b/panels/network/net-device-mobile.c -@@ -508,7 +508,7 @@ options_button_clicked_cb (NetDeviceMobile *self) +@@ -521,7 +521,7 @@ options_button_clicked_cb (NetDeviceMobile *self) connection = net_device_get_find_connection (self->client, self->device); uuid = nm_connection_get_uuid (connection); @@ -114,7 +111,7 @@ index 34eb86241..50d0a2bed 100644 g_debug ("Launching '%s'\n", cmdline); if (!g_spawn_command_line_async (cmdline, &error)) g_warning ("Failed to launch nm-connection-editor: %s", error->message); -@@ -797,7 +797,7 @@ net_device_mobile_init (NetDeviceMobile *self) +@@ -810,7 +810,7 @@ net_device_mobile_init (NetDeviceMobile *self) self->cancellable = g_cancellable_new (); @@ -137,12 +134,12 @@ index a31a606e3..ed5133d29 100644 /* Use SNMP to get printer's informations */ diff --git a/panels/user-accounts/run-passwd.c b/panels/user-accounts/run-passwd.c -index 86f53d4fc..0b052856f 100644 +index edbc99830..1e1d90141 100644 --- a/panels/user-accounts/run-passwd.c +++ b/panels/user-accounts/run-passwd.c -@@ -150,7 +150,7 @@ spawn_passwd (PasswdHandler *passwd_handler, GError **error) +@@ -152,7 +152,7 @@ spawn_passwd (PasswdHandler *passwd_handler, GError **error) gchar **envp; - gint my_stdin, my_stdout, my_stderr; + gint my_stdin, my_stdout; - argv[0] = "/usr/bin/passwd"; /* Is it safe to rely on a hard-coded path? */ + argv[0] = "/run/wrappers/bin/passwd"; /* Is it safe to rely on a hard-coded path? */ @@ -150,10 +147,10 @@ index 86f53d4fc..0b052856f 100644 envp = g_get_environ (); diff --git a/panels/user-accounts/user-utils.c b/panels/user-accounts/user-utils.c -index 83d4cd091..e8784c722 100644 +index 5b7bc1f02..13ffe6ca8 100644 --- a/panels/user-accounts/user-utils.c +++ b/panels/user-accounts/user-utils.c -@@ -486,7 +486,7 @@ is_valid_username_async (const gchar *username, +@@ -215,7 +215,7 @@ is_valid_username_async (const gchar *username, * future, so it would be nice to have some official way for this * instead of relying on the current "--login" implementation. */ |