diff options
author | Jan Malakhovski <oxij@oxij.org> | 2019-02-03 15:33:12 +0000 |
---|---|---|
committer | Jan Malakhovski <oxij@oxij.org> | 2019-02-03 15:33:12 +0000 |
commit | 0f4eb7f977916a149528063ec3b221868de75a42 (patch) | |
tree | 14dd0935a9f2245fb66004555d42d9de71b63e52 | |
parent | 61ef8f0b425625795cf724d6e5a7eb9ddc451e28 (diff) | |
download | nixlib-0f4eb7f977916a149528063ec3b221868de75a42.tar nixlib-0f4eb7f977916a149528063ec3b221868de75a42.tar.gz nixlib-0f4eb7f977916a149528063ec3b221868de75a42.tar.bz2 nixlib-0f4eb7f977916a149528063ec3b221868de75a42.tar.lz nixlib-0f4eb7f977916a149528063ec3b221868de75a42.tar.xz nixlib-0f4eb7f977916a149528063ec3b221868de75a42.tar.zst nixlib-0f4eb7f977916a149528063ec3b221868de75a42.zip |
conky: move defaults to package file
-rw-r--r-- | pkgs/os-specific/linux/conky/default.nix | 4 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/pkgs/os-specific/linux/conky/default.nix b/pkgs/os-specific/linux/conky/default.nix index 3d7fb43bbd1e..d67c268f0542 100644 --- a/pkgs/os-specific/linux/conky/default.nix +++ b/pkgs/os-specific/linux/conky/default.nix @@ -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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 555e944a252b..94cfc3c83eaa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { }; |