forked from mirrors/nixpkgs
svn path=/nixos/branches/modular-nixos/; revision=15895
This commit is contained in:
parent
606a8c87a1
commit
42513650d8
|
@ -55,9 +55,7 @@ let
|
||||||
in
|
in
|
||||||
|
|
||||||
let
|
let
|
||||||
cfg = config.services.showManual;
|
inherit (config.services.showManual) enable ttyNumber browserPackage browserCommand manualFile;
|
||||||
in let # !!! Bug in Nix 0.13pre14722, otherwise the following line is not aware of cfg.
|
|
||||||
inherit (cfg) enable ttyNumber browserPackage browserCommand manualFile;
|
|
||||||
|
|
||||||
realManualFile =
|
realManualFile =
|
||||||
if manualFile == null then
|
if manualFile == null then
|
||||||
|
@ -103,7 +101,7 @@ mkIf enable {
|
||||||
|
|
||||||
mingetty = {
|
mingetty = {
|
||||||
helpLine = mkThenElse {
|
helpLine = mkThenElse {
|
||||||
thenPart = "\nPress <Alt-F${toString ttyNumber}> for NixOS manual.";
|
thenPart = "\nPress <Alt-F${toString ttyNumber}> for the NixOS manual.";
|
||||||
elsePart = "";
|
elsePart = "";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in a new issue