about summary refs log tree commit diff
diff options
context:
space:
mode:
authorTuomas Tynkkynen <tuomas@tuxera.com>2018-05-24 00:55:05 +0300
committerTuomas Tynkkynen <tuomas@tuxera.com>2018-05-25 01:55:51 +0300
commit696c6bed4e8e2d9fd9b956dea7e5d49531e9d13f (patch)
tree526b90e5309780021db153c7eb4fd80d8ab47dd0
parentf8dc087c71be3ffe1d9d5dd19b65b10f9963af14 (diff)
downloadnixlib-696c6bed4e8e2d9fd9b956dea7e5d49531e9d13f.tar
nixlib-696c6bed4e8e2d9fd9b956dea7e5d49531e9d13f.tar.gz
nixlib-696c6bed4e8e2d9fd9b956dea7e5d49531e9d13f.tar.bz2
nixlib-696c6bed4e8e2d9fd9b956dea7e5d49531e9d13f.tar.lz
nixlib-696c6bed4e8e2d9fd9b956dea7e5d49531e9d13f.tar.xz
nixlib-696c6bed4e8e2d9fd9b956dea7e5d49531e9d13f.tar.zst
nixlib-696c6bed4e8e2d9fd9b956dea7e5d49531e9d13f.zip
w3m: Add a variant without graphics support and use for NixOS manual
This gets rid of various graphics libraries from the minimal installer.
-rw-r--r--nixos/modules/services/misc/nixos-manual.nix2
-rw-r--r--pkgs/top-level/all-packages.nix6
2 files changed, 7 insertions, 1 deletions
diff --git a/nixos/modules/services/misc/nixos-manual.nix b/nixos/modules/services/misc/nixos-manual.nix
index 4bd1c20edf71..3916c3052e8b 100644
--- a/nixos/modules/services/misc/nixos-manual.nix
+++ b/nixos/modules/services/misc/nixos-manual.nix
@@ -99,7 +99,7 @@ in
 
     services.nixosManual.browser = mkOption {
       type = types.path;
-      default = "${pkgs.w3m-nox}/bin/w3m";
+      default = "${pkgs.w3m-nographics}/bin/w3m";
       description = ''
         Browser used to show the manual.
       '';
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 712fe6f6386a..ae5da9a8a622 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18552,6 +18552,12 @@ with pkgs;
     imlib2 = imlib2-nox;
   };
 
+  # Version without X11 or graphics
+  w3m-nographics = w3m.override {
+    x11Support = false;
+    graphicsSupport = false;
+  };
+
   # Version for batch text processing, not a good browser
   w3m-batch = w3m.override {
     graphicsSupport = false;