diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2019-06-25 18:06:43 +0200 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2019-06-25 18:06:43 +0200 |
| commit | 07d1d3ed68d914fae46f7c84f85733553ef4e0f8 (patch) | |
| tree | eaec814170899dd3742ae24cb4a03e7578d12aa2 /nixos/modules/misc | |
| parent | 52829801b7e342521f471840169b4be50aed1471 (diff) | |
| parent | 5b4b6b6c24e2756bf5d98eb03974637cd193c076 (diff) | |
| download | nixlib-07d1d3ed68d914fae46f7c84f85733553ef4e0f8.tar nixlib-07d1d3ed68d914fae46f7c84f85733553ef4e0f8.tar.gz nixlib-07d1d3ed68d914fae46f7c84f85733553ef4e0f8.tar.bz2 nixlib-07d1d3ed68d914fae46f7c84f85733553ef4e0f8.tar.lz nixlib-07d1d3ed68d914fae46f7c84f85733553ef4e0f8.tar.xz nixlib-07d1d3ed68d914fae46f7c84f85733553ef4e0f8.tar.zst nixlib-07d1d3ed68d914fae46f7c84f85733553ef4e0f8.zip | |
Merge branch 'master' into staging
Diffstat (limited to 'nixos/modules/misc')
| -rw-r--r-- | nixos/modules/misc/documentation.nix | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/nixos/modules/misc/documentation.nix b/nixos/modules/misc/documentation.nix index 834ac0de9121..deecb005270f 100644 --- a/nixos/modules/misc/documentation.nix +++ b/nixos/modules/misc/documentation.nix @@ -49,11 +49,7 @@ let if [ -z "$browser" ]; then browser="$(type -P xdg-open || true)" if [ -z "$browser" ]; then - browser="$(type -P w3m || true)" - if [ -z "$browser" ]; then - echo "$0: unable to start a web browser; please set \$BROWSER" - exit 1 - fi + browser="${pkgs.w3m-nographics}/bin/w3m" fi fi exec "$browser" ${manual.manualHTMLIndex} @@ -187,8 +183,6 @@ in }) (mkIf cfg.doc.enable { - # TODO(@oxij): put it here and remove from profiles? - # environment.systemPackages = [ pkgs.w3m ]; # w3m-nox? environment.pathsToLink = [ "/share/doc" ]; environment.extraOutputsToInstall = [ "doc" ] ++ optional cfg.dev.enable "devdoc"; }) |