nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-20 12:43:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #160395 from mweinelt/hass-fix-override

Browse Source
This commit is contained in:
Martin Weinelt 2022-02-17 01:43:14 +01:00 committed by GitHub
commit 37b8cedf7f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nixos/modules/services/home-automation/home-assistant.nix
View File

@ -58,8 +58,8 @@ let
package = (cfg.package.override (oldArgs: {
# Respect overrides that already exist in the passed package and
# concat it with values passed via the module.
extraComponents = oldArgs.extraComponents ++ extraComponents;
extraPackages = ps: (oldArgs.extraPackages ps) ++ (cfg.extraPackages ps);
extraComponents = oldArgs.extraComponents or [] ++ extraComponents;
extraPackages = ps: (oldArgs.extraPackages or (_: []) ps) ++ (cfg.extraPackages ps);
}));
in {
imports = [