From 4b1ee3e616190461004dbe50fd26014506eaf85e Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Mon, 18 Dec 2023 16:14:13 -0800 Subject: gnomeExtensions.system-monitor: Remove in favor of system-monitor-next Signed-off-by: Anders Kaseorg --- .../desktops/gnome/extensions/extensionRenames.nix | 1 - .../desktops/gnome/extensions/manuallyPackaged.nix | 1 - .../gnome/extensions/system-monitor/default.nix | 50 ---------------------- .../paths_and_nonexisting_dirs.patch | 33 -------------- 4 files changed, 85 deletions(-) delete mode 100644 pkgs/desktops/gnome/extensions/system-monitor/default.nix delete mode 100644 pkgs/desktops/gnome/extensions/system-monitor/paths_and_nonexisting_dirs.patch (limited to 'pkgs') diff --git a/pkgs/desktops/gnome/extensions/extensionRenames.nix b/pkgs/desktops/gnome/extensions/extensionRenames.nix index ebd2cc93f2a2..7df68fc0ab22 100644 --- a/pkgs/desktops/gnome/extensions/extensionRenames.nix +++ b/pkgs/desktops/gnome/extensions/extensionRenames.nix @@ -88,7 +88,6 @@ # ####### GNOME 40 ####### - "system-monitor@paradoxxx.zero.gmail.com" = "system-monitor"; # manually packaged "System_Monitor@bghome.gmail.com" = "system-monitor-2"; "Hide_Activities@shay.shayel.org" = "hide-activities-button"; diff --git a/pkgs/desktops/gnome/extensions/manuallyPackaged.nix b/pkgs/desktops/gnome/extensions/manuallyPackaged.nix index e1e40ec10593..c0dc65bb3fa6 100644 --- a/pkgs/desktops/gnome/extensions/manuallyPackaged.nix +++ b/pkgs/desktops/gnome/extensions/manuallyPackaged.nix @@ -12,7 +12,6 @@ "pidgin@muffinmad" = callPackage ./pidgin-im-integration { }; "pop-shell@system76.com" = callPackage ./pop-shell { }; "sound-output-device-chooser@kgshank.net" = callPackage ./sound-output-device-chooser { }; - "system-monitor@paradoxxx.zero.gmail.com" = callPackage ./system-monitor { }; "taskwhisperer-extension@infinicode.de" = callPackage ./taskwhisperer { }; "tilingnome@rliang.github.com" = callPackage ./tilingnome { }; "TopIcons@phocean.net" = callPackage ./topicons-plus { }; diff --git a/pkgs/desktops/gnome/extensions/system-monitor/default.nix b/pkgs/desktops/gnome/extensions/system-monitor/default.nix deleted file mode 100644 index 7295e2e392a4..000000000000 --- a/pkgs/desktops/gnome/extensions/system-monitor/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ lib, stdenv, substituteAll, fetchFromGitHub, fetchpatch, glib, glib-networking, libgtop, gnome }: - -stdenv.mkDerivation rec { - pname = "gnome-shell-extension-system-monitor"; - version = "unstable-2023-01-21"; - - src = fetchFromGitHub { - owner = "paradoxxxzero"; - repo = "gnome-shell-system-monitor-applet"; - rev = "21d7b4e7a03ec8145b0b90c4f0b15c27d6f53788"; - hash = "sha256-XDqWxTyaFEWPdXMTklcNQxqql73ESXAIF6TjMFHaj7g="; - }; - - nativeBuildInputs = [ - glib - gnome.gnome-shell - ]; - - patches = [ - # GNOME 44 compatibility - (fetchpatch { - url = "https://github.com/paradoxxxzero/gnome-shell-system-monitor-applet/pull/788/commits/e69349942791140807c01d472dfe5e0ddf5c73c0.patch"; - hash = "sha256-g5Ocpvp7eO/pBkDBZsxgXH7e8rdPBUUxDSwK2hJHKbY="; - }) - (substituteAll { - src = ./paths_and_nonexisting_dirs.patch; - clutter_path = gnome.mutter.libdir; # only needed for GNOME < 40. - gtop_path = "${libgtop}/lib/girepository-1.0"; - glib_net_path = "${glib-networking}/lib/girepository-1.0"; - }) - ]; - - makeFlags = [ - "VERSION=${version}" - "INSTALLBASE=$(out)/share/gnome-shell/extensions" - "SUDO=" - ]; - - passthru = { - extensionUuid = "system-monitor@paradoxxx.zero.gmail.com"; - extensionPortalSlug = "system-monitor"; - }; - - meta = with lib; { - description = "Display system informations in gnome shell status bar"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ andersk ]; - homepage = "https://github.com/paradoxxxzero/gnome-shell-system-monitor-applet"; - }; -} diff --git a/pkgs/desktops/gnome/extensions/system-monitor/paths_and_nonexisting_dirs.patch b/pkgs/desktops/gnome/extensions/system-monitor/paths_and_nonexisting_dirs.patch deleted file mode 100644 index 280af965af3f..000000000000 --- a/pkgs/desktops/gnome/extensions/system-monitor/paths_and_nonexisting_dirs.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff --git a/system-monitor@paradoxxx.zero.gmail.com/extension.js b/system-monitor@paradoxxx.zero.gmail.com/extension.js -index de5e3d7..2d7824d 100644 ---- a/system-monitor@paradoxxx.zero.gmail.com/extension.js -+++ b/system-monitor@paradoxxx.zero.gmail.com/extension.js -@@ -18,6 +18,9 @@ - - // Author: Florian Mounier aka paradoxxxzero - -+imports.gi.GIRepository.Repository.prepend_search_path('@gtop_path@'); -+imports.gi.GIRepository.Repository.prepend_search_path('@glib_net_path@'); -+ - /* Ugly. This is here so that we don't crash old libnm-glib based shells unnecessarily - * by loading the new libnm.so. Should go away eventually */ - -@@ -407,7 +410,7 @@ const smMountsMonitor = class SystemMonitor_smMountsMonitor { - this.connected = false; - - this._volumeMonitor = Gio.VolumeMonitor.get(); -- let sys_mounts = ['/home', '/tmp', '/boot', '/usr', '/usr/local']; -+ let sys_mounts = ['/home', '/tmp', '/boot']; - this.base_mounts = ['/']; - sys_mounts.forEach((sMount) => { - if (this.is_sys_mount(sMount + '/')) { -diff --git a/system-monitor@paradoxxx.zero.gmail.com/prefs.js b/system-monitor@paradoxxx.zero.gmail.com/prefs.js -index 81d667c..0da4809 100644 ---- a/system-monitor@paradoxxx.zero.gmail.com/prefs.js -+++ b/system-monitor@paradoxxx.zero.gmail.com/prefs.js -@@ -1,3 +1,5 @@ -+imports.gi.GIRepository.Repository.prepend_search_path('@clutter_path@'); -+ - const Gtk = imports.gi.Gtk; - const Gio = imports.gi.Gio; - const Gdk = imports.gi.Gdk; -- cgit 1.4.1