summary refs log tree commit diff
path: root/pkgs/desktops/gnome
diff options
context:
space:
mode:
authorpiegames <git@piegames.de>2022-11-09 15:43:42 +0100
committerGitHub <noreply@github.com>2022-11-09 15:43:42 +0100
commitc0752aefe632604326576d7a49ba1723ccd2896f (patch)
tree207dc879688f59c6512a5ca2fcca85e695fe6651 /pkgs/desktops/gnome
parentaef3d81135bf959b01adaf360589e4ce20c18964 (diff)
parent499c2f11bb4d3beabd54d539942df8a2d6cdb523 (diff)
Merge #198351: gnomeExtensions.system-monitor: Patch for GNOME 43
Diffstat (limited to 'pkgs/desktops/gnome')
-rw-r--r--pkgs/desktops/gnome/extensions/system-monitor/default.nix17
1 files changed, 13 insertions, 4 deletions
diff --git a/pkgs/desktops/gnome/extensions/system-monitor/default.nix b/pkgs/desktops/gnome/extensions/system-monitor/default.nix
index 216a1d4c77de4..62d0967303777 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-2022-02-04";
+  version = "unstable-2022-04-25";
 
   src = fetchFromGitHub {
     owner = "paradoxxxzero";
     repo = "gnome-shell-system-monitor-applet";
-    rev = "2c6eb0a447bfc9f1a07c61956c92a55c874baf16";
-    hash = "sha256-JuRRlvqlqneqUdgezKGl2yg7wFYGCCo51q9CBwrxTBY=";
+    rev = "b359d888fd3fcccf1252f5f1dc390299e701493e";
+    hash = "sha256-FHErXetGN4n0TbrLQ5cN7V2IgO96ekHxiHLd0diRFAY=";
   };
 
   nativeBuildInputs = [
@@ -17,6 +17,15 @@ stdenv.mkDerivation rec {
   ];
 
   patches = [
+    # GNOME 43 compatibility
+    (fetchpatch {
+      url = "https://github.com/paradoxxxzero/gnome-shell-system-monitor-applet/pull/754/commits/3b3a617f78c5e9bbce0aa2864b3989335edb37b7.patch";
+      hash = "sha256-BAD0ExQYmTg6i02Gg7jcF0vf1zp232vXRjGCn+rBYXE=";
+    })
+    (fetchpatch {
+      url = "https://github.com/paradoxxxzero/gnome-shell-system-monitor-applet/pull/754/commits/0815ed9da5056542730838fbf6c600506cf7a76f.patch";
+      hash = "sha256-pavjlPV9BxXoqb0YrlP2bXT7tkNQaBkTy1pMrI9MLnk=";
+    })
     (substituteAll {
       src = ./paths_and_nonexisting_dirs.patch;
       clutter_path = gnome.mutter.libdir; # only needed for GNOME < 40.