Merge pull request #47298 from oxij/nixos/doc-in-installer
nixos: fix fallout from #46193
This commit is contained in:
commit
61abf3bbd9
|
@ -22,7 +22,7 @@ with lib;
|
|||
config = {
|
||||
|
||||
# Enable in installer, even if the minimal profile disables it.
|
||||
documentation.nixos.enable = mkForce true;
|
||||
documentation.enable = mkForce true;
|
||||
|
||||
# Show the manual.
|
||||
services.nixosManual.showManual = true;
|
||||
|
|
|
@ -12,7 +12,6 @@ with lib;
|
|||
i18n.supportedLocales = [ (config.i18n.defaultLocale + "/UTF-8") ];
|
||||
|
||||
documentation.enable = mkDefault false;
|
||||
documentation.nixos.enable = mkDefault false;
|
||||
|
||||
sound.enable = mkDefault false;
|
||||
}
|
||||
|
|
|
@ -6,7 +6,10 @@
|
|||
|
||||
with lib;
|
||||
|
||||
let cfg = config.services.nixosManual; in
|
||||
let
|
||||
cfg = config.services.nixosManual;
|
||||
cfgd = config.documentation;
|
||||
in
|
||||
|
||||
{
|
||||
|
||||
|
@ -44,7 +47,7 @@ let cfg = config.services.nixosManual; in
|
|||
config = mkIf cfg.showManual {
|
||||
|
||||
assertions = [{
|
||||
assertion = config.documentation.nixos.enable;
|
||||
assertion = cfgd.enable && cfgd.nixos.enable;
|
||||
message = "Can't enable `service.nixosManual.showManual` without `documentation.nixos.enable`";
|
||||
}];
|
||||
|
||||
|
|
Loading…
Reference in a new issue