diff options
| author | Franz Pletz <fpletz@fnordicwalking.de> | 2016-11-22 21:09:14 +0100 |
|---|---|---|
| committer | Franz Pletz <fpletz@fnordicwalking.de> | 2016-11-23 02:24:12 +0100 |
| commit | f983743d7521fd880e3a8623c0068dc844221ba2 (patch) | |
| tree | 676a62fc05f02505582a1151a321a3f9e361fd67 | |
| parent | 5a184be96f87d647f4261d83f32d08ae2f1a7403 (diff) | |
| download | nixpkgs-f983743d7521fd880e3a8623c0068dc844221ba2.tar nixpkgs-f983743d7521fd880e3a8623c0068dc844221ba2.tar.gz nixpkgs-f983743d7521fd880e3a8623c0068dc844221ba2.tar.bz2 nixpkgs-f983743d7521fd880e3a8623c0068dc844221ba2.tar.lz nixpkgs-f983743d7521fd880e3a8623c0068dc844221ba2.tar.xz nixpkgs-f983743d7521fd880e3a8623c0068dc844221ba2.tar.zst nixpkgs-f983743d7521fd880e3a8623c0068dc844221ba2.zip | |
w3m-nox: use imlib2 without X11 support
Also, the minimal live CD previously installed both the X11 and non-X11 versions (through services.nixosManual) of w3m.
| -rw-r--r-- | nixos/modules/profiles/base.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/nixos/modules/profiles/base.nix b/nixos/modules/profiles/base.nix index d980c298ffc..f90d0d992ec 100644 --- a/nixos/modules/profiles/base.nix +++ b/nixos/modules/profiles/base.nix @@ -7,7 +7,7 @@ # Include some utilities that are useful for installing or repairing # the system. environment.systemPackages = [ - pkgs.w3m # needed for the manual anyway + pkgs.w3m-nox # needed for the manual anyway pkgs.testdisk # useful for repairing boot problems pkgs.mssys # for writing Microsoft boot sectors / MBRs pkgs.efibootmgr diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3c7e2ccdc09..8550ad5c74c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15105,13 +15105,15 @@ in # Version without X11 w3m-nox = w3m.override { x11Support = false; + imlib2 = imlib2-nox; }; # Version for batch text processing, not a good browser w3m-batch = w3m.override { graphicsSupport = false; - x11Support = false; mouseSupport = false; + x11Support = false; + imlib2 = imlib2-nox; }; weechat = callPackage ../applications/networking/irc/weechat { |