diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin/default.nix b/pkgs/by-name/xf/xfce4-sensors-plugin/package.nix similarity index 87% rename from pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin/default.nix rename to pkgs/by-name/xf/xfce4-sensors-plugin/package.nix index a0d57d814510..7a9a7e5689e1 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin/default.nix +++ b/pkgs/by-name/xf/xfce4-sensors-plugin/package.nix @@ -16,8 +16,8 @@ xfce4-panel, libnotify, lm_sensors, - libXNVCtrl, - nvidiaSupport ? lib.meta.availableOn stdenv.hostPlatform libXNVCtrl, + linuxPackages, + nvidiaSupport ? lib.meta.availableOn stdenv.hostPlatform linuxPackages.nvidia_x11.settings.libXNVCtrl, gitUpdater, }: @@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: { libnotify lm_sensors ] - ++ lib.optionals nvidiaSupport [ libXNVCtrl ]; + ++ lib.optionals nvidiaSupport [ linuxPackages.nvidia_x11.settings.libXNVCtrl ]; mesonFlags = [ (lib.mesonEnable "xnvctrl" nvidiaSupport) diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix index 865b450b02bd..0db4340eed19 100644 --- a/pkgs/desktops/xfce/default.nix +++ b/pkgs/desktops/xfce/default.nix @@ -87,12 +87,6 @@ makeScopeWithSplicing' { xfwm4-themes = callPackage ./art/xfwm4-themes { }; - #### PANEL PLUGINS - - xfce4-sensors-plugin = callPackage ./panel-plugins/xfce4-sensors-plugin { - libXNVCtrl = linuxPackages.nvidia_x11.settings.libXNVCtrl; - }; - } // lib.optionalAttrs config.allowAliases { #### ALIASES @@ -147,5 +141,6 @@ makeScopeWithSplicing' { xfce4-whiskermenu-plugin = lib.warnOnInstantiate "‘xfce.xfce4-whiskermenu-plugin’ was moved to top-level. Please use ‘pkgs.xfce4-whiskermenu-plugin’ directly" pkgs.xfce4-whiskermenu-plugin; # Added on 2025-12-19 xfce4-windowck-plugin = lib.warnOnInstantiate "‘xfce.xfce4-windowck-plugin’ was moved to top-level. Please use ‘pkgs.xfce4-windowck-plugin’ directly" pkgs.xfce4-windowck-plugin; # Added on 2025-12-19 xfce4-pulseaudio-plugin = lib.warnOnInstantiate "‘xfce.xfce4-pulseaudio-plugin’ was moved to top-level. Please use ‘pkgs.xfce4-pulseaudio-plugin’ directly" pkgs.xfce4-pulseaudio-plugin; # Added on 2025-12-19 + xfce4-sensors-plugin = lib.warnOnInstantiate "‘xfce.xfce4-sensors-plugin’ was moved to top-level. Please use ‘pkgs.xfce4-sensors-plugin’ directly" pkgs.xfce4-sensors-plugin; # Added on 2025-12-19 }