summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
authorDaiderd Jordan <daiderd@gmail.com>2023-07-09 08:02:16 +0200
committerGitHub <noreply@github.com>2023-07-09 08:02:16 +0200
commit4e3fc1864712a534d30ef074d695e968f1fb1487 (patch)
tree3d93bc2e280be185eebaf19e108dd4e7481f8a16 /modules
parent4272af4079164cc89a1c1d90d04b35a9f0da04f7 (diff)
parentd9e825f121784a7628ae177a04cb80709043e0fe (diff)
Merge pull request #724 from Enzime/fix/darwin-builder
linux-builder: fix evaluation errors
Diffstat (limited to 'modules')
-rw-r--r--modules/nix/linux-builder.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/nix/linux-builder.nix b/modules/nix/linux-builder.nix
index ce50fde..1796a30 100644
--- a/modules/nix/linux-builder.nix
+++ b/modules/nix/linux-builder.nix
@@ -8,7 +8,7 @@ let
cfg = config.nix.linux-builder;
builderWithOverrides = cfg.package.override {
- modules = [ cfg.modules ];
+ inherit (cfg) modules;
};
in
@@ -46,7 +46,7 @@ in
config = mkIf cfg.enable {
assertions = [ {
- assertion = config.nix.settings.trusted-users != [ "root" ] || config.nix.settings.extra-trusted-users != [ ];
+ assertion = config.nix.settings.trusted-users != [ "root" ] || (config.nix.settings.extra-trusted-users or [ ]) != [ ];
message = ''
Your user or group (@admin) needs to be added to `nix.settings.trusted-users` or `nix.settings.extra-trusted-users`
to use the Linux builder.