From 9e0f4552d8f4f8311ee753e7a71fbdf7cdc1acc8 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 22 May 2025 23:01:00 +0800 Subject: [PATCH] xfce.xfce4-sensors-plugin: 1.4.5 -> 1.5.0 https://gitlab.xfce.org/panel-plugins/xfce4-sensors-plugin/-/compare/xfce4-sensors-plugin-1.4.5...xfce4-sensors-plugin-1.5.0 --- .../xfce4-sensors-plugin/default.nix | 59 +++++++++---------- 1 file changed, 28 insertions(+), 31 deletions(-) diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin/default.nix index 92b00ce574f8..34d58203d0c2 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin/default.nix @@ -3,73 +3,70 @@ lib, fetchurl, gettext, + meson, + ninja, pkg-config, + wrapGAppsHook3, + glib, gtk3, + libX11, + libXext, libxfce4ui, libxfce4util, xfce4-panel, libnotify, lm_sensors, - hddtemp, - netcat-gnu, libXNVCtrl, nvidiaSupport ? lib.meta.availableOn stdenv.hostPlatform libXNVCtrl, gitUpdater, }: -let - category = "panel-plugins"; -in - -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "xfce4-sensors-plugin"; - version = "1.4.5"; + version = "1.5.0"; src = fetchurl { - url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-9p/febf3bSqBckgoEkpvznaAOpEipMgt6PPfo++7F5o="; + url = "mirror://xfce/src/panel-plugins/xfce4-sensors-plugin/${lib.versions.majorMinor finalAttrs.version}/xfce4-sensors-plugin-${finalAttrs.version}.tar.xz"; + hash = "sha256-hARCuH/d3NhZW9n4Pqi4H3cf4pa7nSq/Dhl54ghyeuk="; }; + strictDeps = true; + nativeBuildInputs = [ gettext + meson + ninja pkg-config + wrapGAppsHook3 ]; buildInputs = [ + glib gtk3 + libX11 + libXext libxfce4ui libxfce4util xfce4-panel libnotify lm_sensors - hddtemp - netcat-gnu ] ++ lib.optionals nvidiaSupport [ libXNVCtrl ]; - enableParallelBuilding = true; - - configureFlags = - [ - "--with-pathhddtemp=${hddtemp}/bin/hddtemp" - "--with-pathnetcat=${netcat-gnu}/bin/netcat" - ] - ++ lib.optionals nvidiaSupport [ - # Have to be explicitly enabled since this tries to figure out the default - # based on the existence of a hardcoded `/usr/include/NVCtrl` path. - "--enable-xnvctrl" - ]; + mesonFlags = [ + (lib.mesonEnable "xnvctrl" nvidiaSupport) + ]; passthru.updateScript = gitUpdater { - url = "https://gitlab.xfce.org/panel-plugins/${pname}"; - rev-prefix = "${pname}-"; + url = "https://gitlab.xfce.org/panel-plugins/xfce4-sensors-plugin"; + rev-prefix = "xfce4-sensors-plugin-"; }; - meta = with lib; { + meta = { homepage = "https://docs.xfce.org/panel-plugins/xfce4-sensors-plugin"; description = "Panel plug-in for different sensors using acpi, lm_sensors and hddtemp"; mainProgram = "xfce4-sensors"; - license = licenses.gpl2Plus; - platforms = platforms.unix; - teams = [ teams.xfce ]; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.unix; + teams = [ lib.teams.xfce ]; }; -} +})