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

nixos/home-assistant: do not always override extraComponents (#43845)

Browse Source 
Fixes #43843.
This commit is contained in:
Robert Schütz 2018-07-20 19:28:29 +02:00 committed by GitHub
parent 446ec6df2d
commit 55a12c9763
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nixos/modules/services/misc/home-assistant.nix
View File

@ -37,7 +37,7 @@ let
# List of components used in config # List of components used in config
extraComponents = filter useComponent availableComponents; extraComponents = filter useComponent availableComponents;
package = if cfg.autoExtraComponents package = if (cfg.autoExtraComponents && cfg.config != null)
then (cfg.package.override { inherit extraComponents; }) then (cfg.package.override { inherit extraComponents; })
else cfg.package; else cfg.package;
@ -110,7 +110,9 @@ in {
''; '';
description = '' description = ''
Home Assistant package to use. Home Assistant package to use.
Override <literal>extraPackages</literal> in order to add additional dependencies. Override <literal>extraPackages</literal> or <literal>extraComponents</literal> in order to add additional dependencies.
If you specify <option>config</option> and do not set <option>autoExtraComponents</option>
to <literal>false</literal>, overriding <literal>extraComponents</literal> will have no effect.
''; '';
}; };