diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2019-06-22 21:37:22 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-22 21:37:22 -0400 |
| commit | 9d9b98cdfba4e94a946da4e3abb6a9b061d8725e (patch) | |
| tree | 394f1726b39e03149d76ad264939bc2da695ed13 /nixos | |
| parent | e0c8a45d5d476954c0b593f031af8e8c33d5d279 (diff) | |
| parent | 03d6c406fc6ac48a04cb6d290eca7ea7136cbdc4 (diff) | |
| download | nixpkgs-9d9b98cdfba4e94a946da4e3abb6a9b061d8725e.tar nixpkgs-9d9b98cdfba4e94a946da4e3abb6a9b061d8725e.tar.gz nixpkgs-9d9b98cdfba4e94a946da4e3abb6a9b061d8725e.tar.bz2 nixpkgs-9d9b98cdfba4e94a946da4e3abb6a9b061d8725e.tar.lz nixpkgs-9d9b98cdfba4e94a946da4e3abb6a9b061d8725e.tar.xz nixpkgs-9d9b98cdfba4e94a946da4e3abb6a9b061d8725e.tar.zst nixpkgs-9d9b98cdfba4e94a946da4e3abb6a9b061d8725e.zip | |
Merge pull request #62891 from jtojnar/nixos-documentation-nixos-help-use-w3m-1-by-default
nixos/documentation: nixos-help: use w3m(1) by default
Diffstat (limited to 'nixos')
| -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 834ac0de912..deecb005270 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"; }) |