diff options
author | Jan Malakhovski <oxij@oxij.org> | 2018-09-06 19:17:44 +0000 |
---|---|---|
committer | Jan Malakhovski <oxij@oxij.org> | 2018-09-23 20:47:58 +0000 |
commit | fe744d3fb1d61e6f7f7c2f40217364f9577390ca (patch) | |
tree | 522c9fc8d568e238399b376f00e74dbc4056b4a4 /nixos/modules | |
parent | 56853dc6d83a861050bbc02041dbe65f7b1b6f63 (diff) | |
download | nixlib-fe744d3fb1d61e6f7f7c2f40217364f9577390ca.tar nixlib-fe744d3fb1d61e6f7f7c2f40217364f9577390ca.tar.gz nixlib-fe744d3fb1d61e6f7f7c2f40217364f9577390ca.tar.bz2 nixlib-fe744d3fb1d61e6f7f7c2f40217364f9577390ca.tar.lz nixlib-fe744d3fb1d61e6f7f7c2f40217364f9577390ca.tar.xz nixlib-fe744d3fb1d61e6f7f7c2f40217364f9577390ca.tar.zst nixlib-fe744d3fb1d61e6f7f7c2f40217364f9577390ca.zip |
nixos: doc: rename `manual` to `manualHTML`, cleanup references
Because when I see "config.system.build.manual.manual" after I forgot what it means I ask "Why do I need that second `.manual` there again?". Doesn't happen with `config.system.build.manual.manualHTML`.
Diffstat (limited to 'nixos/modules')
-rw-r--r-- | nixos/modules/installer/cd-dvd/installation-cd-graphical-kde.nix | 2 | ||||
-rw-r--r-- | nixos/modules/services/misc/nixos-manual.nix | 8 |
2 files changed, 4 insertions, 6 deletions
diff --git a/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde.nix b/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde.nix index f71ed46c7e9e..1c3c9cb30b41 100644 --- a/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde.nix +++ b/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde.nix @@ -30,7 +30,7 @@ with lib; Version=1.0 Type=Application Name=NixOS Manual - Exec=firefox ${config.system.build.manual.manual}/share/doc/nixos/index.html + Exec=firefox ${config.system.build.manual.manualHTMLIndex} Icon=text-html ''; diff --git a/nixos/modules/services/misc/nixos-manual.nix b/nixos/modules/services/misc/nixos-manual.nix index 993b59590bb0..37705e2a889c 100644 --- a/nixos/modules/services/misc/nixos-manual.nix +++ b/nixos/modules/services/misc/nixos-manual.nix @@ -39,8 +39,6 @@ let in scrubbedEval.options; }; - entry = "${manual.manual}/share/doc/nixos/index.html"; - helpScript = pkgs.writeScriptBin "nixos-help" '' #! ${pkgs.runtimeShell} -e @@ -61,7 +59,7 @@ let fi fi fi - exec "$browser" ${entry} + exec "$browser" ${manual.manualHTMLIndex} ''; desktopItem = pkgs.makeDesktopItem { @@ -121,7 +119,7 @@ in 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 ]; + ++ optionals config.documentation.doc.enable [ manual.manualHTML helpScript ]; boot.extraTTYs = mkIf cfg.showManual ["tty${toString cfg.ttyNumber}"]; @@ -130,7 +128,7 @@ in { description = "NixOS Manual"; wantedBy = [ "multi-user.target" ]; serviceConfig = - { ExecStart = "${cfg.browser} ${entry}"; + { ExecStart = "${cfg.browser} ${manual.manualHTMLIndex}"; StandardInput = "tty"; StandardOutput = "tty"; TTYPath = "/dev/tty${toString cfg.ttyNumber}"; |