conky: enable nvidia support
This commit is contained in:
parent
96457d26dd
commit
6a6fb6d31c
@ -26,6 +26,7 @@
|
||||
, toluapp ? null
|
||||
|
||||
, wirelessSupport ? true , wirelesstools ? null
|
||||
, nvidiaSupport ? true , libXNVCtrl ? null
|
||||
|
||||
, curlSupport ? true , curl ? null
|
||||
, rssSupport ? curlSupport
|
||||
@ -52,6 +53,7 @@ assert luaCairoSupport || luaImlib2Support
|
||||
-> lua.luaversion == "5.1";
|
||||
|
||||
assert wirelessSupport -> wirelesstools != null;
|
||||
assert nvidiaSupport -> libXNVCtrl != null;
|
||||
|
||||
assert curlSupport -> curl != null;
|
||||
assert rssSupport -> curlSupport && libxml2 != null;
|
||||
@ -100,6 +102,7 @@ stdenv.mkDerivation rec {
|
||||
++ optional curlSupport curl
|
||||
++ optional rssSupport libxml2
|
||||
++ optional weatherXoapSupport libxml2
|
||||
++ optional nvidiaSupport libXNVCtrl
|
||||
;
|
||||
|
||||
cmakeFlags = []
|
||||
@ -118,6 +121,7 @@ stdenv.mkDerivation rec {
|
||||
++ optional weatherMetarSupport "-DBUILD_WEATHER_METAR=ON"
|
||||
++ optional weatherXoapSupport "-DBUILD_WEATHER_XOAP=ON"
|
||||
++ optional wirelessSupport "-DBUILD_WLAN=ON"
|
||||
++ optional nvidiaSupport "-DBUILD_NVIDIA=ON"
|
||||
;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
@ -11756,6 +11756,7 @@ with pkgs;
|
||||
|
||||
conky = callPackage ../os-specific/linux/conky ({
|
||||
lua = lua5_1; # conky can use 5.2, but toluapp can not
|
||||
libXNVCtrl = linuxPackages.nvidia_x11.settings.libXNVCtrl;
|
||||
} // config.conky or {});
|
||||
|
||||
conntrack_tools = callPackage ../os-specific/linux/conntrack-tools { };
|
||||
|
Loading…
Reference in New Issue
Block a user