From 966b98f945100796b0ef042a24442f9460a94e10 Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Mon, 28 Mar 2022 21:45:11 -0700 Subject: [PATCH 1/2] =?UTF-8?q?gnomeExtensions.system-monitor:=202021-09-0?= =?UTF-8?q?7=20=E2=86=92=202022-02-04?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Needed for GNOME 42 support. Signed-off-by: Anders Kaseorg --- .../gnome/extensions/system-monitor/default.nix | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/pkgs/desktops/gnome/extensions/system-monitor/default.nix b/pkgs/desktops/gnome/extensions/system-monitor/default.nix index d770acfec16f..53e1b2d411c6 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, fetchpatch, glib, glib-networking, libgtop, gnome }: +{ lib, stdenv, substituteAll, fetchFromGitHub, glib, glib-networking, libgtop, gnome }: stdenv.mkDerivation rec { pname = "gnome-shell-extension-system-monitor"; - version = "unstable-2021-09-07"; + version = "unstable-2022-02-04"; src = fetchFromGitHub { owner = "paradoxxxzero"; repo = "gnome-shell-system-monitor-applet"; - rev = "133f9f32bca5d159515d709bbdee81bf497ebdc5"; - sha256 = "1vz1s1x22xmmzaayrzv5jyzlmxslhfaybbnv959szvfp4mdrhch9"; + rev = "2c6eb0a447bfc9f1a07c61956c92a55c874baf16"; + hash = "sha256-JuRRlvqlqneqUdgezKGl2yg7wFYGCCo51q9CBwrxTBY="; }; buildInputs = [ @@ -24,11 +24,6 @@ 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 = '' From daa0d0d2650a20d992bf35b9e2ed1933bacac95a Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Tue, 5 Apr 2022 15:28:58 -0700 Subject: [PATCH 2/2] gnomeExtensions.system-monitor: Use upstream Makefile to fix version Signed-off-by: Anders Kaseorg --- .../extensions/system-monitor/default.nix | 22 ++++++------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/pkgs/desktops/gnome/extensions/system-monitor/default.nix b/pkgs/desktops/gnome/extensions/system-monitor/default.nix index 53e1b2d411c6..216a1d4c77de 100644 --- a/pkgs/desktops/gnome/extensions/system-monitor/default.nix +++ b/pkgs/desktops/gnome/extensions/system-monitor/default.nix @@ -11,10 +11,9 @@ stdenv.mkDerivation rec { hash = "sha256-JuRRlvqlqneqUdgezKGl2yg7wFYGCCo51q9CBwrxTBY="; }; - buildInputs = [ + nativeBuildInputs = [ glib - glib-networking - libgtop + gnome.gnome-shell ]; patches = [ @@ -26,18 +25,11 @@ stdenv.mkDerivation rec { }) ]; - buildPhase = '' - runHook preBuild - glib-compile-schemas --targetdir="system-monitor@paradoxxx.zero.gmail.com/schemas" "system-monitor@paradoxxx.zero.gmail.com/schemas" - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - mkdir -p $out/share/gnome-shell/extensions - cp -r "system-monitor@paradoxxx.zero.gmail.com" $out/share/gnome-shell/extensions - runHook postInstall - ''; + makeFlags = [ + "VERSION=${version}" + "INSTALLBASE=$(out)/share/gnome-shell/extensions" + "SUDO=" + ]; passthru = { extensionUuid = "system-monitor@paradoxxx.zero.gmail.com";