diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-09-28 00:06:02 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-28 00:06:02 +0000 |
| commit | 70776ac2181f09d5028b94dac9c971b1a7ae2347 (patch) | |
| tree | 837d640f1528a45fba5fb70b9935f78e28112c8b /pkgs/desktops | |
| parent | 3f66160994a8a1061841e7fb3c4e2b31b9902d83 (diff) | |
| parent | bc71a15e46269cafe7f702946ce2ab232d4df448 (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/desktops')
| -rw-r--r-- | pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin/default.nix | 43 |
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 33bdb052b6a9e..8a2cd770944ba 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; }; } |