git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #92886 from jtojnar/fix/gse-sysmon
commita23cb68ccf806178639fcb5d8340dd7a498da24f authorJan Tojnar <jtojnar@gmail.com> dateFri 10 Jul 2020, 20:35 (6 years ago) parentc960abfe96bf89
3 files changed+37−15
pkgs/desktops/gnome-3/core/mutter/default.nix+16−2 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/core/mutter/default.nix+16−2
@@ -1,6 +1,7 @@
11{ fetchurl
22, fetchpatch
33, substituteAll
4+, runCommand
45, stdenv
56, pkgconfig
67, gnome3
@@ -42,7 +43,7 @@
4243, wayland-protocols
4344}:
4445
45−stdenv.mkDerivation rec {
46+let self = stdenv.mkDerivation rec {
4647 pname = "mutter";
4748 version = "3.36.4";
4849
@@ -132,6 +133,18 @@ stdenv.mkDerivation rec {
132133 '';
133134
134135 passthru = {
136+ libdir = "${self}/lib/mutter-6";
137+
138+ tests = {
139+ libdirExists = runCommand "mutter-libdir-exists" {} ''
140+ if [[ ! -d ${self.libdir} ]]; then
141+ echo "passthru.libdir should contain a directory, “${self.libdir}” is not one."
142+ exit 1
143+ fi
144+ touch $out
145+ '';
146+ };
147+
135148 updateScript = gnome3.updateScript {
136149 packageName = pname;
137150 attrPath = "gnome3.${pname}";
@@ -145,4 +158,5 @@ stdenv.mkDerivation rec {
145158 maintainers = teams.gnome.members;
146159 platforms = platforms.linux;
147160 };
148−}
161+};
162+in self
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;