From daa0d0d2650a20d992bf35b9e2ed1933bacac95a Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Tue, 5 Apr 2022 15:28:58 -0700 Subject: [PATCH] gnomeExtensions.system-monitor: Use upstream Makefile to fix version Signed-off-by: Anders Kaseorg --- .../extensions/system-monitor/default.nix | 22 ++++++------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/pkgs/desktops/gnome/extensions/system-monitor/default.nix b/pkgs/desktops/gnome/extensions/system-monitor/default.nix index 53e1b2d411c6..216a1d4c77de 100644 --- a/pkgs/desktops/gnome/extensions/system-monitor/default.nix +++ b/pkgs/desktops/gnome/extensions/system-monitor/default.nix @@ -11,10 +11,9 @@ stdenv.mkDerivation rec { hash = "sha256-JuRRlvqlqneqUdgezKGl2yg7wFYGCCo51q9CBwrxTBY="; }; - buildInputs = [ + nativeBuildInputs = [ glib - glib-networking - libgtop + gnome.gnome-shell ]; patches = [ @@ -26,18 +25,11 @@ stdenv.mkDerivation rec { }) ]; - 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";