summary refs log tree commit diff
path: root/nixos/modules/services/misc/nixos-manual.nix
diff options
context:
space:
mode:
authorJan Malakhovski <oxij@oxij.org>2018-03-26 18:22:04 +0000
committerJan Malakhovski <oxij@oxij.org>2018-03-30 06:52:26 +0000
commit98fd9b7f86e9548931935c1bb0c8f7fe5e5eb680 (patch)
tree2bcef86801233623be1d35d7faa33fbf9738a04c /nixos/modules/services/misc/nixos-manual.nix
parenta7af5d4f88f9e30bc9b401a84b7cb3cf036fccbb (diff)
downloadnixlib-98fd9b7f86e9548931935c1bb0c8f7fe5e5eb680.tar
nixlib-98fd9b7f86e9548931935c1bb0c8f7fe5e5eb680.tar.gz
nixlib-98fd9b7f86e9548931935c1bb0c8f7fe5e5eb680.tar.bz2
nixlib-98fd9b7f86e9548931935c1bb0c8f7fe5e5eb680.tar.lz
nixlib-98fd9b7f86e9548931935c1bb0c8f7fe5e5eb680.tar.xz
nixlib-98fd9b7f86e9548931935c1bb0c8f7fe5e5eb680.tar.zst
nixlib-98fd9b7f86e9548931935c1bb0c8f7fe5e5eb680.zip
nixos: doc: introduce `documentation` config subtree
Diffstat (limited to 'nixos/modules/services/misc/nixos-manual.nix')
-rw-r--r--nixos/modules/services/misc/nixos-manual.nix8
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}"];