public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #28728 from canndrew/conky-nvidia

Browse Source 
conky: enable nvidia support
This commit is contained in:
Jörg Thalheim 2017-08-30 07:43:51 +01:00 committed by GitHub
commit 8df6c177a3
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/os-specific/linux/conky/default.nix
View File

@ -26,6 +26,7 @@
, toluapp ? null , toluapp ? null
, wirelessSupport ? true , wirelesstools ? null , wirelessSupport ? true , wirelesstools ? null
, nvidiaSupport ? true , libXNVCtrl ? null
, curlSupport ? true , curl ? null , curlSupport ? true , curl ? null
, rssSupport ? curlSupport , rssSupport ? curlSupport
@ -52,6 +53,7 @@ assert luaCairoSupport || luaImlib2Support
-> lua.luaversion == "5.1"; -> lua.luaversion == "5.1";
assert wirelessSupport -> wirelesstools != null; assert wirelessSupport -> wirelesstools != null;
assert nvidiaSupport -> libXNVCtrl != null;
assert curlSupport -> curl != null; assert curlSupport -> curl != null;
assert rssSupport -> curlSupport && libxml2 != null; assert rssSupport -> curlSupport && libxml2 != null;
@ -100,6 +102,7 @@ stdenv.mkDerivation rec {
++ optional curlSupport curl ++ optional curlSupport curl
++ optional rssSupport libxml2 ++ optional rssSupport libxml2
++ optional weatherXoapSupport libxml2 ++ optional weatherXoapSupport libxml2
++ optional nvidiaSupport libXNVCtrl
; ;
cmakeFlags = [] cmakeFlags = []
@ -118,6 +121,7 @@ stdenv.mkDerivation rec {
++ optional weatherMetarSupport "-DBUILD_WEATHER_METAR=ON" ++ optional weatherMetarSupport "-DBUILD_WEATHER_METAR=ON"
++ optional weatherXoapSupport "-DBUILD_WEATHER_XOAP=ON" ++ optional weatherXoapSupport "-DBUILD_WEATHER_XOAP=ON"
++ optional wirelessSupport "-DBUILD_WLAN=ON" ++ optional wirelessSupport "-DBUILD_WLAN=ON"
++ optional nvidiaSupport "-DBUILD_NVIDIA=ON"
; ;
meta = with stdenv.lib; { meta = with stdenv.lib; {

1
pkgs/top-level/all-packages.nix
View File

@ -11832,6 +11832,7 @@ with pkgs;
conky = callPackage ../os-specific/linux/conky ({ conky = callPackage ../os-specific/linux/conky ({
lua = lua5_1; # conky can use 5.2, but toluapp can not lua = lua5_1; # conky can use 5.2, but toluapp can not
libXNVCtrl = linuxPackages.nvidia_x11.settings.libXNVCtrl;
} // config.conky or {}); } // config.conky or {});
conntrack_tools = callPackage ../os-specific/linux/conntrack-tools { }; conntrack_tools = callPackage ../os-specific/linux/conntrack-tools { };