about summary refs log tree commit diff
diff options
context:
space:
mode:
authorSandro <sandro.jaeckel@gmail.com>2022-09-27 23:58:04 +0200
committerGitHub <noreply@github.com>2022-09-27 23:58:04 +0200
commitf78e05946d06a95c0acb3cbe6f16575dd98699ae (patch)
tree41e7bd621859c927612b1c2b58ec300f0c7c70cf
parentce2dd28a1e8e2fafa2a69bb7754a35bf4c369090 (diff)
parent21667ec81c19382f8f5f2a13144ee65228dae284 (diff)
downloadnixlib-f78e05946d06a95c0acb3cbe6f16575dd98699ae.tar
nixlib-f78e05946d06a95c0acb3cbe6f16575dd98699ae.tar.gz
nixlib-f78e05946d06a95c0acb3cbe6f16575dd98699ae.tar.bz2
nixlib-f78e05946d06a95c0acb3cbe6f16575dd98699ae.tar.lz
nixlib-f78e05946d06a95c0acb3cbe6f16575dd98699ae.tar.xz
nixlib-f78e05946d06a95c0acb3cbe6f16575dd98699ae.tar.zst
nixlib-f78e05946d06a95c0acb3cbe6f16575dd98699ae.zip
Merge pull request #193192 from romildo/upd.xfce4-cpugraph-plugin
-rw-r--r--pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin/default.nix43
1 files changed, 11 insertions, 32 deletions
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin/default.nix
index 33bdb052b6a9..8a2cd770944b 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin/default.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin/default.nix
@@ -1,57 +1,36 @@
 { lib
-, stdenv
-, fetchurl
-, pkg-config
-, intltool
-, glib
+, mkXfceDerivation
 , exo
+, gtk3
 , libXtst
-, xorgproto
+, libxfce4ui
 , libxfce4util
 , xfce4-panel
-, libxfce4ui
 , xfconf
-, gtk3
-, hicolor-icon-theme
-, xfce
+, xorgproto
 }:
 
-let
+mkXfceDerivation rec {
   category = "panel-plugins";
-in stdenv.mkDerivation rec {
   pname  = "xfce4-cpugraph-plugin";
   version = "1.2.6";
-
-  src = fetchurl {
-    url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
-    sha256 = "sha256-dzJG9XwYJKhUaNQRnBeusHFw7R66zo+kBsf7z1tHr5k=";
-  };
-
-  nativeBuildInputs = [
-    pkg-config
-    intltool
-  ];
+  rev-prefix = "xfce4-cpugraph-plugin-";
+  odd-unstable = false;
+  sha256 = "sha256-Elm10ZGN93R+1XZ4vJJZZIJ6OcaHpsrH0nQRMMuFnLY=";
 
   buildInputs = [
-    glib
     exo
+    gtk3
     libXtst
-    xorgproto
-    libxfce4util
     libxfce4ui
+    libxfce4util
     xfce4-panel
     xfconf
-    gtk3
-    hicolor-icon-theme
+    xorgproto
   ];
 
-  passthru.updateScript = xfce.archiveUpdater { inherit category pname version; };
-
   meta = with lib; {
-    homepage = "https://docs.xfce.org/panel-plugins/xfce4-cpugraph-plugin";
     description = "CPU graph show for Xfce panel";
-    license = licenses.gpl2Plus;
-    platforms = platforms.linux;
     maintainers = with maintainers; [ ] ++ teams.xfce.members;
   };
 }