From d0a9dcb01d19837cb5e0a801fd5e40984cb59360 Mon Sep 17 00:00:00 2001 From: Nicolas Schneider Date: Mon, 5 Mar 2018 21:21:33 +0100 Subject: conky: provide option to build with pulseaudio support --- pkgs/os-specific/linux/conky/default.nix | 4 ++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 5 insertions(+) (limited to 'pkgs') diff --git a/pkgs/os-specific/linux/conky/default.nix b/pkgs/os-specific/linux/conky/default.nix index ea9c3f937d0..e4c45a9440a 100644 --- a/pkgs/os-specific/linux/conky/default.nix +++ b/pkgs/os-specific/linux/conky/default.nix @@ -27,6 +27,7 @@ , wirelessSupport ? true , wirelesstools ? null , nvidiaSupport ? false , libXNVCtrl ? null +, pulseSupport ? false , libpulseaudio ? null , curlSupport ? true , curl ? null , rssSupport ? curlSupport @@ -54,6 +55,7 @@ assert luaCairoSupport || luaImlib2Support assert wirelessSupport -> wirelesstools != null; assert nvidiaSupport -> libXNVCtrl != null; +assert pulseSupport -> libpulseaudio != null; assert curlSupport -> curl != null; assert rssSupport -> curlSupport && libxml2 != null; @@ -100,6 +102,7 @@ stdenv.mkDerivation rec { ++ optional rssSupport libxml2 ++ optional weatherXoapSupport libxml2 ++ optional nvidiaSupport libXNVCtrl + ++ optional pulseSupport libpulseaudio ; cmakeFlags = [] @@ -119,6 +122,7 @@ stdenv.mkDerivation rec { ++ optional weatherXoapSupport "-DBUILD_WEATHER_XOAP=ON" ++ optional wirelessSupport "-DBUILD_WLAN=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`: diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 476ebd37096..4f830996e9d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12928,6 +12928,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; + pulseSupport = config.pulseaudio or false; } // config.conky or {}); conntrack_tools = callPackage ../os-specific/linux/conntrack-tools { }; -- cgit 1.4.1