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

conky: provide option to build with pulseaudio support

Browse Source
This commit is contained in:
Nicolas Schneider 2018-03-05 21:21:33 +01:00 committed by Jan Tojnar
parent aa878c2d15
commit d0a9dcb01d
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
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

@ -27,6 +27,7 @@
, wirelessSupport ? true , wirelesstools ? null , wirelessSupport ? true , wirelesstools ? null
, nvidiaSupport ? false , libXNVCtrl ? null , nvidiaSupport ? false , libXNVCtrl ? null
, pulseSupport ? false , libpulseaudio ? null
, curlSupport ? true , curl ? null , curlSupport ? true , curl ? null
, rssSupport ? curlSupport , rssSupport ? curlSupport
@ -54,6 +55,7 @@ assert luaCairoSupport || luaImlib2Support
assert wirelessSupport -> wirelesstools != null; assert wirelessSupport -> wirelesstools != null;
assert nvidiaSupport -> libXNVCtrl != null; assert nvidiaSupport -> libXNVCtrl != null;
assert pulseSupport -> libpulseaudio != 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 rssSupport libxml2 ++ optional rssSupport libxml2
++ optional weatherXoapSupport libxml2 ++ optional weatherXoapSupport libxml2
++ optional nvidiaSupport libXNVCtrl ++ optional nvidiaSupport libXNVCtrl
++ optional pulseSupport libpulseaudio
; ;
cmakeFlags = [] cmakeFlags = []
@ -119,6 +122,7 @@ stdenv.mkDerivation rec {
++ 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" ++ optional nvidiaSupport "-DBUILD_NVIDIA=ON"
++ optional pulseSupport "-DBUILD_PULSEAUDIO=ON"
; ;
# `make -f src/CMakeFiles/conky.dir/build.make src/CMakeFiles/conky.dir/conky.cc.o`: # `make -f src/CMakeFiles/conky.dir/build.make src/CMakeFiles/conky.dir/conky.cc.o`:

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

@ -12928,6 +12928,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; libXNVCtrl = linuxPackages.nvidia_x11.settings.libXNVCtrl;
pulseSupport = config.pulseaudio or false;
} // config.conky or {}); } // config.conky or {});
conntrack_tools = callPackage ../os-specific/linux/conntrack-tools { }; conntrack_tools = callPackage ../os-specific/linux/conntrack-tools { };