diff options
author | piegames <git@piegames.de> | 2022-04-06 00:55:19 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-04-06 00:55:19 +0200 |
commit | b178b904ecf13cfd5cbfe82bc092e0668a0af82b (patch) | |
tree | 6cffa4a843d99fb38d1b1f270165584efd65d5f5 /pkgs/desktops/gnome/extensions | |
parent | 4bfd31e4e02f488b407176d14cdea3fb610550e4 (diff) | |
parent | daa0d0d2650a20d992bf35b9e2ed1933bacac95a (diff) |
Merge #166187: gnomeExtensions.system-monitor: 2021-09-07 → 2022-02-04
Diffstat (limited to 'pkgs/desktops/gnome/extensions')
-rw-r--r-- | pkgs/desktops/gnome/extensions/system-monitor/default.nix | 35 |
1 files changed, 11 insertions, 24 deletions
diff --git a/pkgs/desktops/gnome/extensions/system-monitor/default.nix b/pkgs/desktops/gnome/extensions/system-monitor/default.nix index d770acfec16f9..216a1d4c77de4 100644 --- a/pkgs/desktops/gnome/extensions/system-monitor/default.nix +++ b/pkgs/desktops/gnome/extensions/system-monitor/default.nix @@ -1,20 +1,19 @@ -{ 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 = [ + nativeBuildInputs = [ glib - glib-networking - libgtop + gnome.gnome-shell ]; patches = [ @@ -24,25 +23,13 @@ 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 = '' - 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"; |