diff options
author | Nano Twerpus <nanotwerp@gmail.com> | 2024-05-30 16:28:22 -0400 |
---|---|---|
committer | Nano Twerpus <nanotwerp@gmail.com> | 2024-05-30 17:37:55 -0400 |
commit | 78ecb9195e5ba9594709188f9af26b743f244040 (patch) | |
tree | 70efda227c98b150fe493f08888ff645b1f3060f /pkgs/desktops/gnome/core/gnome-shell-extensions | |
parent | 442b72ad24e2378a3c9a12c994d2084ae397789c (diff) |
gnome.gnome-shell-extensions: patch GTop path for the GNOME System Monitor extension
Formatted with `nixfmt-rfc-style`.
Diffstat (limited to 'pkgs/desktops/gnome/core/gnome-shell-extensions')
-rw-r--r-- | pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix | 32 | ||||
-rw-r--r-- | pkgs/desktops/gnome/core/gnome-shell-extensions/fix_gtop.patch | 25 |
2 files changed, 43 insertions, 14 deletions
diff --git a/pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix b/pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix index 9887f7f11c522..cb5feb26e4080 100644 --- a/pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix +++ b/pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix @@ -1,14 +1,16 @@ -{ lib -, stdenv -, fetchurl -, meson -, ninja -, gettext -, pkg-config -, glib -, gnome -, gnome-menus -, substituteAll +{ + lib, + stdenv, + fetchurl, + meson, + ninja, + gettext, + pkg-config, + libgtop, + glib, + gnome, + gnome-menus, + substituteAll, }: stdenv.mkDerivation (finalAttrs: { @@ -25,6 +27,10 @@ stdenv.mkDerivation (finalAttrs: { src = ./fix_gmenu.patch; gmenu_path = "${gnome-menus}/lib/girepository-1.0"; }) + (substituteAll { + src = ./fix_gtop.patch; + gtop_path = "${libgtop}/lib/girepository-1.0"; + }) ]; nativeBuildInputs = [ @@ -35,9 +41,7 @@ stdenv.mkDerivation (finalAttrs: { glib ]; - mesonFlags = [ - "-Dextension_set=all" - ]; + mesonFlags = [ "-Dextension_set=all" ]; preFixup = '' # Since we do not install the schemas to central location, diff --git a/pkgs/desktops/gnome/core/gnome-shell-extensions/fix_gtop.patch b/pkgs/desktops/gnome/core/gnome-shell-extensions/fix_gtop.patch new file mode 100644 index 0000000000000..61c90f184d1ec --- /dev/null +++ b/pkgs/desktops/gnome/core/gnome-shell-extensions/fix_gtop.patch @@ -0,0 +1,25 @@ +diff --git a/extensions/system-monitor/extension.js b/extensions/system-monitor/extension.js +index 37d2eb1..232d0d5 100644 +--- a/extensions/system-monitor/extension.js ++++ b/extensions/system-monitor/extension.js +@@ -6,9 +6,9 @@ + + import Clutter from 'gi://Clutter'; + import Gio from 'gi://Gio'; ++import GIRepository from "gi://GIRepository"; + import GLib from 'gi://GLib'; + import GObject from 'gi://GObject'; +-import GTop from 'gi://GTop'; + import Pango from 'gi://Pango'; + import Shell from 'gi://Shell'; + import St from 'gi://St'; +@@ -19,6 +19,9 @@ import * as PopupMenu from 'resource:///org/gnome/shell/ui/popupMenu.js'; + + import * as Main from 'resource:///org/gnome/shell/ui/main.js'; + ++GIRepository.Repository.prepend_search_path('@gtop_path@'); ++const GTop = (await import("gi://GTop")).default; ++ + const THRESHOLD_HIGH = 0.80; + + // adapted from load-graph.cpp in gnome-system-monitor |