summary refs log tree commit diff
path: root/modules
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2010-08-11 12:28:53 +0000
committerEelco Dolstra <eelco.dolstra@logicblox.com>2010-08-11 12:28:53 +0000
commit2ec105cc85eea3c37e88f2e0a893604499ab6e00 (patch)
tree0c8ae93db7015cdf68a8178ff776028f4b8e7ca6 /modules
parent310fffa9749172c0dac39715ba9a7e59e43b90a8 (diff)
downloadnixlib-2ec105cc85eea3c37e88f2e0a893604499ab6e00.tar
nixlib-2ec105cc85eea3c37e88f2e0a893604499ab6e00.tar.gz
nixlib-2ec105cc85eea3c37e88f2e0a893604499ab6e00.tar.bz2
nixlib-2ec105cc85eea3c37e88f2e0a893604499ab6e00.tar.lz
nixlib-2ec105cc85eea3c37e88f2e0a893604499ab6e00.tar.xz
nixlib-2ec105cc85eea3c37e88f2e0a893604499ab6e00.tar.zst
nixlib-2ec105cc85eea3c37e88f2e0a893604499ab6e00.zip
* Separate building of the NixOS manual and manpages. Usually we only
  need the manpages, and the manual takes much longer to build.

svn path=/nixos/trunk/; revision=23112
Diffstat (limited to 'modules')
-rw-r--r--modules/services/misc/nixos-manual.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/services/misc/nixos-manual.nix b/modules/services/misc/nixos-manual.nix
index ed2972e5b5bb..f463a91998e2 100644
--- a/modules/services/misc/nixos-manual.nix
+++ b/modules/services/misc/nixos-manual.nix
@@ -68,7 +68,7 @@ in
 
     system.build.manual = manual;
 
-    environment.systemPackages = [manual];
+    environment.systemPackages = [ manual.manpages ];
 
     boot.extraTTYs = mkIf cfg.showManual ["tty${cfg.ttyNumber}"];
 
@@ -82,7 +82,7 @@ in
 
           exec =
             ''
-              ${cfg.browser} ${manual}/share/doc/nixos/manual.html \
+              ${cfg.browser} ${manual.manual}/share/doc/nixos/manual.html \
                 < /dev/tty${toString cfg.ttyNumber} > /dev/tty${toString cfg.ttyNumber} 2>&1
             '';
         };