From 3c9c083309f6f0a3770cfcf8ba45f362bb8721db Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 25 Feb 2023 03:02:33 +0000 Subject: [PATCH] =?UTF-8?q?gnome.gnome-system-monitor:=2042.0=20=E2=86=92?= =?UTF-8?q?=2044.beta?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-system-monitor/-/compare/42.0...44.beta Changelog-Reviewed-By: Jan Tojnar --- .../gnome/core/gnome-system-monitor/default.nix | 4 ++-- .../gnome/core/gnome-system-monitor/fix-paths.patch | 13 ++++++------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-system-monitor/default.nix b/pkgs/desktops/gnome/core/gnome-system-monitor/default.nix index cbce4ad8b05c..34998812363e 100644 --- a/pkgs/desktops/gnome/core/gnome-system-monitor/default.nix +++ b/pkgs/desktops/gnome/core/gnome-system-monitor/default.nix @@ -23,11 +23,11 @@ stdenv.mkDerivation rec { pname = "gnome-system-monitor"; - version = "42.0"; + version = "44.beta"; src = fetchurl { url = "mirror://gnome/sources/gnome-system-monitor/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "EyOdIgMiAaIr0pgzxXW2hIFnANLeFooVMCI1d8XAddw="; + sha256 = "Egfvkub0i3xayAddrZlqML0YW1Ub2EuIJy6jnUDWD/I="; }; patches = [ diff --git a/pkgs/desktops/gnome/core/gnome-system-monitor/fix-paths.patch b/pkgs/desktops/gnome/core/gnome-system-monitor/fix-paths.patch index ab6e845ae4bf..967ef5e15542 100644 --- a/pkgs/desktops/gnome/core/gnome-system-monitor/fix-paths.patch +++ b/pkgs/desktops/gnome/core/gnome-system-monitor/fix-paths.patch @@ -1,13 +1,12 @@ diff --git a/src/gsm_pkexec.cpp b/src/gsm_pkexec.cpp -index 868969ba..51eb93b5 100644 +index 5e1edf2f..717d7bf1 100644 --- a/src/gsm_pkexec.cpp +++ b/src/gsm_pkexec.cpp -@@ -33,6 +33,7 @@ gboolean gsm_pkexec_create_root_password_dialog(const char *command) +@@ -36,5 +36,6 @@ gsm_pkexec_create_root_password_dialog (const char *command) gboolean - procman_has_pkexec(void) + procman_has_pkexec (void) { -- return g_file_test("/usr/bin/pkexec", G_FILE_TEST_EXISTS); -+ return g_file_test("/run/wrappers/bin/pkexec", G_FILE_TEST_EXISTS) -+ || g_file_test("/usr/bin/pkexec", G_FILE_TEST_EXISTS); +- return g_file_test ("/usr/bin/pkexec", G_FILE_TEST_EXISTS); ++ return g_file_test ("/run/wrappers/bin/pkexec", G_FILE_TEST_EXISTS) ++ || g_file_test ("/usr/bin/pkexec", G_FILE_TEST_EXISTS); } -