diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2017-08-30 07:43:51 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-30 07:43:51 +0100 |
| commit | 8df6c177a30f44ff6327ae5c36ce0209a08b23cd (patch) | |
| tree | eed23900505f207d9d3dcf350c17c9b84ab24406 /pkgs/os-specific/linux | |
| parent | b50309a5b5802485e0421af6d27888ef1ef53576 (diff) | |
| parent | 6a6fb6d31cc736af4cf9893deffcd0151f0b8c11 (diff) | |
| download | nixlib-8df6c177a30f44ff6327ae5c36ce0209a08b23cd.tar nixlib-8df6c177a30f44ff6327ae5c36ce0209a08b23cd.tar.gz nixlib-8df6c177a30f44ff6327ae5c36ce0209a08b23cd.tar.bz2 nixlib-8df6c177a30f44ff6327ae5c36ce0209a08b23cd.tar.lz nixlib-8df6c177a30f44ff6327ae5c36ce0209a08b23cd.tar.xz nixlib-8df6c177a30f44ff6327ae5c36ce0209a08b23cd.tar.zst nixlib-8df6c177a30f44ff6327ae5c36ce0209a08b23cd.zip | |
Merge pull request #28728 from canndrew/conky-nvidia
conky: enable nvidia support
Diffstat (limited to 'pkgs/os-specific/linux')
| -rw-r--r-- | pkgs/os-specific/linux/conky/default.nix | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/pkgs/os-specific/linux/conky/default.nix b/pkgs/os-specific/linux/conky/default.nix index 9c2553dbf456..35bcb6151c5c 100644 --- a/pkgs/os-specific/linux/conky/default.nix +++ b/pkgs/os-specific/linux/conky/default.nix @@ -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; { |