public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #23861 from benley/nixos-manual-launcher

Browse Source 
nixos: Add a menu launcher for the NixOS manual
This commit is contained in:
Benjamin Staffin 2017-03-15 04:37:16 -04:00 committed by GitHub
commit 98e4c5dd45
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
nixos/modules/services/misc/nixos-manual.nix
View File

@ -41,7 +41,7 @@ let
entry = "${manual.manual}/share/doc/nixos/index.html"; entry = "${manual.manual}/share/doc/nixos/index.html";
help = pkgs.writeScriptBin "nixos-help" helpScript = pkgs.writeScriptBin "nixos-help"
'' ''
#! ${pkgs.stdenv.shell} -e #! ${pkgs.stdenv.shell} -e
browser="$BROWSER" browser="$BROWSER"
@ -58,6 +58,15 @@ let
exec "$browser" ${entry} exec "$browser" ${entry}
''; '';
desktopItem = pkgs.makeDesktopItem {
name = "nixos-manual";
desktopName = "NixOS Manual";
genericName = "View NixOS documentation in a web browser";
# TODO: find a better icon (Nix logo + help overlay?)
icon = "system-help";
exec = "${helpScript}/bin/nixos-help";
categories = "System";
};
in in
{ {
@ -105,7 +114,8 @@ in
system.build.manual = manual; system.build.manual = manual;
environment.systemPackages = environment.systemPackages =
[ manual.manual help ] [ manual.manual helpScript ]
++ optional config.services.xserver.enable desktopItem
++ optional config.programs.man.enable manual.manpages; ++ optional config.programs.man.enable manual.manpages;
boot.extraTTYs = mkIf cfg.showManual ["tty${toString cfg.ttyNumber}"]; boot.extraTTYs = mkIf cfg.showManual ["tty${toString cfg.ttyNumber}"];