git.iko.soy/typeable/nixpkgs
on master help sign in
gnomeExtensions.system-monitor: unbreak with newer GNOME Shell

Had to switch to master and include Clutter typelib to path since recent versions of GNOME Shell open preferences out of Shell context.

commite96bf89d1e36c89998afc63f74a9dce07ce99c18 authorJan Tojnar <jtojnar@gmail.com> dateFri 10 Jul 2020, 20:12 (6 years ago) parenta100503
2 files changed+21−13
pkgs/desktops/gnome-3/extensions/system-monitor/default.nix+5−7 pkgs/desktops/gnome-3/extensions/system-monitor/paths_and_nonexisting_dirs.patch+16−6
pkgs/desktops/gnome-3/extensions/system-monitor/default.nix+5−7
@@ -1,14 +1,14 @@
1−{ stdenv, substituteAll, fetchFromGitHub, glib, glib-networking, libgtop, gnome3 }:
1+{ stdenv, substituteAll, fetchpatch, fetchFromGitHub, glib, glib-networking, libgtop, gnome3 }:
22
33stdenv.mkDerivation rec {
44 pname = "gnome-shell-system-monitor";
5− version = "38";
5+ version = "2020-04-27-unstable";
66
77 src = fetchFromGitHub {
88 owner = "paradoxxxzero";
99 repo = "gnome-shell-system-monitor-applet";
10− rev = "v${version}";
11− sha256 = "1sdj2kxb418mgq44a6lf6jic33wlfbnn3ja61igmx0jj1530iknv";
10+ rev = "7f8f0a7b255473941f14d1dcaa35ebf39d3bccd0";
11+ sha256 = "tUUvBY0UEUE+T79zVZEAICpKoriFZuuZzi9ArdHdXks=";
1212 };
1313
1414 buildInputs = [
@@ -20,6 +20,7 @@ stdenv.mkDerivation rec {
2020 patches = [
2121 (substituteAll {
2222 src = ./paths_and_nonexisting_dirs.patch;
23+ clutter_path = gnome3.mutter.libdir; # this should not be used in settings but 🤷‍♀️
2324 gtop_path = "${libgtop}/lib/girepository-1.0";
2425 glib_net_path = "${glib-networking}/lib/girepository-1.0";
2526 })
@@ -41,8 +42,5 @@ stdenv.mkDerivation rec {
4142 license = licenses.gpl3Plus;
4243 maintainers = with maintainers; [ tiramiseb ];
4344 homepage = "https://github.com/paradoxxxzero/gnome-shell-system-monitor-applet";
44− # 3.36 support not yet ready
45− # https://github.com/paradoxxxzero/gnome-shell-system-monitor-applet/pull/564
46− broken = stdenv.lib.versionAtLeast gnome3.gnome-shell.version "3.34";
4745 };
4846}
pkgs/desktops/gnome-3/extensions/system-monitor/paths_and_nonexisting_dirs.patch+16−6
@@ -1,5 +1,5 @@
11diff --git a/system-monitor@paradoxxx.zero.gmail.com/extension.js b/system-monitor@paradoxxx.zero.gmail.com/extension.js
2−index b4b7f15..d139135 100644
2+index de5e3d7..2d7824d 100644
33--- a/system-monitor@paradoxxx.zero.gmail.com/extension.js
44+++ b/system-monitor@paradoxxx.zero.gmail.com/extension.js
55@@ -18,6 +18,9 @@
@@ -11,13 +11,23 @@ index b4b7f15..d139135 100644
1111+
1212 /* Ugly. This is here so that we don't crash old libnm-glib based shells unnecessarily
1313 * by loading the new libnm.so. Should go away eventually */
14− const libnm_glib = imports.gi.GIRepository.Repository.get_default().is_registered("NMClient", "1.0");
15−@@ -386,7 +389,7 @@ const smMountsMonitor = new Lang.Class({
16− connected: false,
17− _init: function () {
14+
15+@@ -407,7 +410,7 @@ const smMountsMonitor = class SystemMonitor_smMountsMonitor {
16+ this.connected = false;
17+
1818 this._volumeMonitor = Gio.VolumeMonitor.get();
1919- let sys_mounts = ['/home', '/tmp', '/boot', '/usr', '/usr/local'];
2020+ let sys_mounts = ['/home', '/tmp', '/boot'];
2121 this.base_mounts = ['/'];
22− sys_mounts.forEach(Lang.bind(this, function (sMount) {
22+ sys_mounts.forEach((sMount) => {
2323 if (this.is_sys_mount(sMount + '/')) {
24+diff --git a/system-monitor@paradoxxx.zero.gmail.com/prefs.js b/system-monitor@paradoxxx.zero.gmail.com/prefs.js
25+index 81d667c..0da4809 100644
26+--- a/system-monitor@paradoxxx.zero.gmail.com/prefs.js
27++++ b/system-monitor@paradoxxx.zero.gmail.com/prefs.js
28+@@ -1,3 +1,5 @@
29++imports.gi.GIRepository.Repository.prepend_search_path('@clutter_path@');
30++
31+ const Gtk = imports.gi.Gtk;
32+ const Gio = imports.gi.Gio;
33+ const Gdk = imports.gi.Gdk;