movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-13 13:40:28 +03:00
Code Activity

nixos manuals: bring back package references

Browse source 
This reverts most of 89e983786a, as those references are sanitized now.
Fixes #10039, at least most of it.

The `sane` case wasn't fixed, as it calls a *function* in pkgs to get
the default value.
This commit is contained in:
Vladimír Čunát 2016-01-13 11:48:11 +01:00
parent e0feace5cd
commit 4fede53c09
9 changed files with 13 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

3
nixos/modules/services/misc/nixos-manual.nix
View file

@ -96,6 +96,7 @@ in
services.nixosManual.browser = mkOption {
type = types.path;
default = "${pkgs.w3m-nox}/bin/w3m";
description = ''
Browser used to show the manual.
'';
@ -133,8 +134,6 @@ in
services.mingetty.helpLine = mkIf cfg.showManual
"\nPress <Alt-F${toString cfg.ttyNumber}> for the NixOS manual.";
services.nixosManual.browser = mkDefault "${pkgs.w3m-nox}/bin/w3m";
};
}