public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

w3m: use gpm with ncurses support

Browse Source 
fixes #9652
This commit is contained in:
Pascal Wittmann 2015-09-14 17:46:48 +02:00
parent 483479ffba
commit f16eea1867
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/networking/browsers/w3m/default.nix
View File

@ -4,12 +4,12 @@
, mouseSupport ? false , mouseSupport ? false
, ncurses, openssl ? null, boehmgc, gettext, zlib , ncurses, openssl ? null, boehmgc, gettext, zlib
, imlib2 ? null, x11 ? null, fbcon ? null , imlib2 ? null, x11 ? null, fbcon ? null
, gpm ? null , gpm-ncurses ? null
}: }:
assert sslSupport -> openssl != null; assert sslSupport -> openssl != null;
assert graphicsSupport -> imlib2 != null && (x11 != null || fbcon != null); assert graphicsSupport -> imlib2 != null && (x11 != null || fbcon != null);
assert mouseSupport -> gpm != null; assert mouseSupport -> gpm-ncurses != null;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "w3m-0.5.3"; name = "w3m-0.5.3";
@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
buildInputs = [ncurses boehmgc gettext zlib] buildInputs = [ncurses boehmgc gettext zlib]
++ stdenv.lib.optional sslSupport openssl ++ stdenv.lib.optional sslSupport openssl
++ stdenv.lib.optional mouseSupport gpm ++ stdenv.lib.optional mouseSupport gpm-ncurses
++ stdenv.lib.optionals graphicsSupport [imlib2 x11 fbcon]; ++ stdenv.lib.optionals graphicsSupport [imlib2 x11 fbcon];
configureFlags = "--with-ssl=${openssl} --with-gc=${boehmgc}" configureFlags = "--with-ssl=${openssl} --with-gc=${boehmgc}"

2
pkgs/top-level/all-packages.nix
View File

@ -9650,6 +9650,8 @@ let
ncurses = null; # Keep curses disabled for lack of value ncurses = null; # Keep curses disabled for lack of value
}; };
gpm-ncurses = gpm.override { inherit ncurses; };
gradm = callPackage ../os-specific/linux/gradm { gradm = callPackage ../os-specific/linux/gradm {
flex = flex_2_5_35; flex = flex_2_5_35;
}; };