alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #62891 from jtojnar/nixos-documentation-nixos-help-use-w3m-1-by-default

Browse source 
nixos/documentation: nixos-help: use w3m(1) by default
This commit is contained in:
Matthew Bauer 2019-06-22 21:37:22 -04:00 committed by GitHub
parent e0c8a45d5d 03d6c406fc
commit 9d9b98cdfb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
nixos/modules/misc/documentation.nix
View file

@ -49,11 +49,7 @@ let
if [ -z "$browser" ]; then if [ -z "$browser" ]; then
browser="$(type -P xdg-open || true)" browser="$(type -P xdg-open || true)"
if [ -z "$browser" ]; then if [ -z "$browser" ]; then
browser="$(type -P w3m || true)" browser="${pkgs.w3m-nographics}/bin/w3m"
if [ -z "$browser" ]; then
echo "$0: unable to start a web browser; please set \$BROWSER"
exit 1
fi
fi fi
fi fi
exec "$browser" ${manual.manualHTMLIndex} exec "$browser" ${manual.manualHTMLIndex}
@ -187,8 +183,6 @@ in
}) })
(mkIf cfg.doc.enable { (mkIf cfg.doc.enable {
# TODO(@oxij): put it here and remove from profiles?
# environment.systemPackages = [ pkgs.w3m ]; # w3m-nox?
environment.pathsToLink = [ "/share/doc" ]; environment.pathsToLink = [ "/share/doc" ];
environment.extraOutputsToInstall = [ "doc" ] ++ optional cfg.dev.enable "devdoc"; environment.extraOutputsToInstall = [ "doc" ] ++ optional cfg.dev.enable "devdoc";
}) })