diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2018-04-05 07:09:32 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-05 07:09:32 +0000 |
| commit | b07ce1fb74b90604a711ee545ca820ed38c66b2c (patch) | |
| tree | 4c263d77cc595c4e63a271a77c34fd8081b2d043 /nixos/modules/services/misc | |
| parent | 195521350ae6035b561e5d0227f83dee6effa5f7 (diff) | |
| parent | 98fd9b7f86e9548931935c1bb0c8f7fe5e5eb680 (diff) | |
| download | nixlib-b07ce1fb74b90604a711ee545ca820ed38c66b2c.tar nixlib-b07ce1fb74b90604a711ee545ca820ed38c66b2c.tar.gz nixlib-b07ce1fb74b90604a711ee545ca820ed38c66b2c.tar.bz2 nixlib-b07ce1fb74b90604a711ee545ca820ed38c66b2c.tar.lz nixlib-b07ce1fb74b90604a711ee545ca820ed38c66b2c.tar.xz nixlib-b07ce1fb74b90604a711ee545ca820ed38c66b2c.tar.zst nixlib-b07ce1fb74b90604a711ee545ca820ed38c66b2c.zip | |
Merge pull request #38114 from oxij/nixos/doc-module
nixos: doc module
Diffstat (limited to 'nixos/modules/services/misc')
| -rw-r--r-- | nixos/modules/services/misc/nixos-manual.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/nixos/modules/services/misc/nixos-manual.nix b/nixos/modules/services/misc/nixos-manual.nix index b8253956d54f..abf506ea7c67 100644 --- a/nixos/modules/services/misc/nixos-manual.nix +++ b/nixos/modules/services/misc/nixos-manual.nix @@ -112,10 +112,10 @@ in system.build.manual = manual; - environment.systemPackages = - [ manual.manual helpScript ] - ++ optionals config.services.xserver.enable [desktopItem pkgs.nixos-icons] - ++ optional config.programs.man.enable manual.manpages; + environment.systemPackages = [] + ++ optionals config.services.xserver.enable [ desktopItem pkgs.nixos-icons ] + ++ optional config.documentation.man.enable manual.manpages + ++ optionals config.documentation.doc.enable [ manual.manual helpScript ]; boot.extraTTYs = mkIf cfg.showManual ["tty${toString cfg.ttyNumber}"]; |