mirrors/nix-darwin
1
0
Fork 0
mirror of https://github.com/LnL7/nix-darwin.git synced 2024-12-14 11:57:34 +00:00
Code Activity

linux-builder: change from modules to config

Browse source 
Using the type `deferredModule` fixes `pkgs` not being accessible as a
module argument (apart from `config._module.args.pkgs`).
This commit is contained in:
Michael Hoang 2023-09-28 01:49:38 +01:00
parent 829041cf10
commit 70af808347
1 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
modules/nix/linux-builder.nix
View file

@ -8,11 +8,15 @@ let
cfg = config.nix.linux-builder; cfg = config.nix.linux-builder;
builderWithOverrides = cfg.package.override { builderWithOverrides = cfg.package.override {
inherit (cfg) modules; modules = [ cfg.config ];
}; };
in in
{ {
imports = [
(mkRemovedOptionModule [ "nix" "linux-builder" "modules" ] "This option has been replaced with `nix.linux-builder.config` which allows setting options directly like `nix.linux-builder.config.networking.hostName = \"banana\";.")
];
options.nix.linux-builder = { options.nix.linux-builder = {
enable = mkEnableOption (lib.mdDoc "Linux builder"); enable = mkEnableOption (lib.mdDoc "Linux builder");
@ -25,21 +29,19 @@ in
''; '';
}; };
modules = mkOption { config = mkOption {
type = types.listOf types.anything; type = types.deferredModule;
default = [ ]; default = { };
example = literalExpression '' example = literalExpression ''
[ ({ pkgs, ... }:
({ config, ... }:
{ {
virtualisation.darwin-builder.hostPort = 22; environment.systemPackages = [ pkgs.neovim ];
}) })
]
''; '';
description = lib.mdDoc '' description = lib.mdDoc ''
This option specifies extra NixOS modules and configuration for the builder. You should first run the Linux builder This option specifies extra NixOS configuration for the builder. You should first use the Linux builder
without changing this option otherwise you may not be able to build the Linux builder. without changing the builder configuration otherwise you may not be able to build the Linux builder.
''; '';
}; };