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

conky: move defaults to package file

Browse Source
This commit is contained in:
Jan Malakhovski 2019-02-03 15:33:12 +00:00
parent 61ef8f0b42
commit 0f4eb7f977
2 changed files with 3 additions and 4 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

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, pkgconfig, cmake
{ config, stdenv, fetchFromGitHub, pkgconfig, cmake
# dependencies
, glib, libXinerama
@ -27,7 +27,7 @@
, wirelessSupport ? true , wirelesstools ? null
, nvidiaSupport ? false , libXNVCtrl ? null
, pulseSupport ? false , libpulseaudio ? null
, pulseSupport ? config.pulseaudio or false, libpulseaudio ? null
, curlSupport ? true , curl ? null
, rssSupport ? curlSupport

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

@ -14326,8 +14326,7 @@ in
conky = callPackage ../os-specific/linux/conky ({
lua = lua5_3_compat;
libXNVCtrl = linuxPackages.nvidia_x11.settings.libXNVCtrl;
pulseSupport = config.pulseaudio or false;
inherit (linuxPackages.nvidia_x11.settings) libXNVCtrl;
} // config.conky or {});
conntrack-tools = callPackage ../os-specific/linux/conntrack-tools { };