Unverified Commit de68f01d authored by Bobby Rong's avatar Bobby Rong Committed by GitHub
Browse files

Merge pull request #316744 from useranon350/xfce-plugin-temp 

xfce.xfce4-sensors-plugin: Enable xnvctrl by default
parents d125f0e4 c5b09348

pkgs/desktops/xfce/default.nix

+4 −1
Original line number Diff line number Diff line 
{ config

, lib

, linuxPackages

, pkgs

, generateSplicesForMkScope

, makeScopeWithSplicing'
@@ -140,7 +141,9 @@ makeScopeWithSplicing' { 


      xfce4-mpc-plugin = callPackage ./panel-plugins/xfce4-mpc-plugin { };



      xfce4-sensors-plugin = callPackage ./panel-plugins/xfce4-sensors-plugin { };

      xfce4-sensors-plugin = callPackage ./panel-plugins/xfce4-sensors-plugin {

        libXNVCtrl = linuxPackages.nvidia_x11.settings.libXNVCtrl;

      };



      xfce4-systemload-plugin = callPackage ./panel-plugins/xfce4-systemload-plugin { };

pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin/default.nix

+29 −8
Original line number Diff line number Diff line 
{ lib, stdenv, fetchurl, pkg-config, intltool, gtk3, libxfce4ui,

  libxfce4util, xfce4-panel, libnotify, lm_sensors, hddtemp, netcat-gnu, gitUpdater

{

  stdenv,

  lib,

  fetchurl,

  pkg-config,

  intltool,

  gtk3,

  libxfce4ui,

  libxfce4util,

  xfce4-panel,

  libnotify,

  lm_sensors,

  hddtemp,

  netcat-gnu,

  nvidiaSupport ? true,

  libXNVCtrl,

  gitUpdater,

}:



let
@@ -29,13 +44,19 @@ stdenv.mkDerivation rec { 
    lm_sensors

    hddtemp

    netcat-gnu

   ];

  ] ++ lib.optionals nvidiaSupport [ libXNVCtrl ];



  enableParallelBuilding = true;



  configureFlags = [

  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"

    ];



  passthru.updateScript = gitUpdater {