From 11c76c639d5cfc36a91b38e7fc4002f0883f047a Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Fri, 22 Oct 2021 04:13:52 -0700 Subject: [PATCH] =?UTF-8?q?gnomeExtensions.system-monitor:=20unstable-2021?= =?UTF-8?q?-06-19=20=E2=86=92=20unstable-2021-09-07,=20support=20GNOME=204?= =?UTF-8?q?1=20(#142156)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gnome/extensions/system-monitor/default.nix | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/pkgs/desktops/gnome/extensions/system-monitor/default.nix b/pkgs/desktops/gnome/extensions/system-monitor/default.nix index 439f02622a6..d770acfec16 100644 --- a/pkgs/desktops/gnome/extensions/system-monitor/default.nix +++ b/pkgs/desktops/gnome/extensions/system-monitor/default.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, substituteAll, fetchFromGitHub, glib, glib-networking, libgtop, gnome }: +{ lib, stdenv, substituteAll, fetchFromGitHub, fetchpatch, glib, glib-networking, libgtop, gnome }: stdenv.mkDerivation rec { pname = "gnome-shell-extension-system-monitor"; - version = "unstable-2021-06-19"; + version = "unstable-2021-09-07"; src = fetchFromGitHub { owner = "paradoxxxzero"; repo = "gnome-shell-system-monitor-applet"; - rev = "bece7be22352b81d3d81e64e18a385812851b8de"; - sha256 = "08nnsg7z3cqk25hfgy4wm02hd2wpz13kig498kn4mf5f1q4hslmx"; + rev = "133f9f32bca5d159515d709bbdee81bf497ebdc5"; + sha256 = "1vz1s1x22xmmzaayrzv5jyzlmxslhfaybbnv959szvfp4mdrhch9"; }; buildInputs = [ @@ -24,6 +24,11 @@ stdenv.mkDerivation rec { gtop_path = "${libgtop}/lib/girepository-1.0"; glib_net_path = "${glib-networking}/lib/girepository-1.0"; }) + # Support GNOME 41 + (fetchpatch { + url = "https://github.com/paradoxxxzero/gnome-shell-system-monitor-applet/pull/718/commits/f4ebc29afa707326b977230329e634db169f55b1.patch"; + sha256 = "0ndnla41mvrww6ldf9d55ar1ibyj8ak5pp1dkjg75jii9slgzjqb"; + }) ]; buildPhase = '' @@ -47,7 +52,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Display system informations in gnome shell status bar"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ tiramiseb ]; + maintainers = with maintainers; [ andersk ]; homepage = "https://github.com/paradoxxxzero/gnome-shell-system-monitor-applet"; }; }