From 0075855ef783f5b9953976c801705eca46458397 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 21 Sep 2023 14:49:18 +0000 Subject: [PATCH] =?UTF-8?q?baobab:=2045.alpha=20=E2=86=92=2045.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/baobab/-/compare/45.alpha...45.0 Fixes for the "move to new libadwaita widgets". Changelog-reviewed-by: Bobby Rong Changelog-reviewed-by: Jan Tojnar --- pkgs/desktops/gnome/core/baobab/default.nix | 4 ++-- .../gnome/core/gnome-control-center/default.nix | 6 +++--- .../gnome/core/gnome-control-center/paths.patch | 17 ----------------- 3 files changed, 5 insertions(+), 22 deletions(-) diff --git a/pkgs/desktops/gnome/core/baobab/default.nix b/pkgs/desktops/gnome/core/baobab/default.nix index 128e405ccf0d..e813f5f591ab 100644 --- a/pkgs/desktops/gnome/core/baobab/default.nix +++ b/pkgs/desktops/gnome/core/baobab/default.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { pname = "baobab"; - version = "45.alpha"; + version = "45.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "0q3Ui/eSFWMtsbkbrlZXLaaGrDxdRb1V/hiGT2Fj888="; + sha256 = "p9LPMIpsg57gsL8HT49f1g1iri8GSpSzxhDWVgt1joY="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome/core/gnome-control-center/default.nix b/pkgs/desktops/gnome/core/gnome-control-center/default.nix index e238f2afb169..df3ab34448b8 100644 --- a/pkgs/desktops/gnome/core/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome/core/gnome-control-center/default.nix @@ -68,18 +68,17 @@ stdenv.mkDerivation rec { pname = "gnome-control-center"; - version = "45.rc"; + version = "45.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-kiyRn4VMZZcXelwXK5Q5zLIB9OYerMVD4GGJmPuo63M="; + sha256 = "sha256-g99qkPmJFPLBmocs4GVirO9AknY39nnDgwmSZcz6Qs8="; }; patches = [ (substituteAll { src = ./paths.patch; gcm = gnome-color-manager; - tecla = gnome-tecla; inherit glibc tzdata shadow; inherit cups networkmanagerapplet; }) @@ -113,6 +112,7 @@ stdenv.mkDerivation rec { gnome-online-accounts gnome-remote-desktop # optional, sharing panel gnome-settings-daemon + gnome-tecla gnome-user-share # optional, sharing panel gsettings-desktop-schemas gsound diff --git a/pkgs/desktops/gnome/core/gnome-control-center/paths.patch b/pkgs/desktops/gnome/core/gnome-control-center/paths.patch index 8a2a38cc642d..165497f11e2a 100644 --- a/pkgs/desktops/gnome/core/gnome-control-center/paths.patch +++ b/pkgs/desktops/gnome/core/gnome-control-center/paths.patch @@ -54,23 +54,6 @@ index a2376f8a4..98769e08f 100644 typedef struct _TzDB TzDB; typedef struct _TzLocation TzLocation; -diff --git a/panels/keyboard/cc-input-list-box.c b/panels/keyboard/cc-input-list-box.c -index 6c2cb5614..8f57159cc 100644 ---- a/panels/keyboard/cc-input-list-box.c -+++ b/panels/keyboard/cc-input-list-box.c -@@ -223,10 +223,10 @@ row_layout_cb (CcInputListBox *self, - layout_variant = cc_input_source_get_layout_variant (source); - - if (layout_variant && layout_variant[0]) -- commandline = g_strdup_printf ("tecla \"%s+%s\"", -+ commandline = g_strdup_printf ("@tecla@/bin/tecla \"%s+%s\"", - layout, layout_variant); - else -- commandline = g_strdup_printf ("tecla %s", -+ commandline = g_strdup_printf ("@tecla@/bin/tecla %s", - layout); - - g_spawn_command_line_async (commandline, NULL); diff --git a/panels/network/connection-editor/net-connection-editor.c b/panels/network/connection-editor/net-connection-editor.c index 505b8ee25..62e94009f 100644 --- a/panels/network/connection-editor/net-connection-editor.c