From f16eea1867418a8f375b8124a812928092827277 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Mon, 14 Sep 2015 17:46:48 +0200 Subject: [PATCH] w3m: use gpm with ncurses support fixes #9652 --- pkgs/applications/networking/browsers/w3m/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/w3m/default.nix b/pkgs/applications/networking/browsers/w3m/default.nix index 5d9705cfe1b..ade28b519bc 100644 --- a/pkgs/applications/networking/browsers/w3m/default.nix +++ b/pkgs/applications/networking/browsers/w3m/default.nix @@ -4,12 +4,12 @@ , mouseSupport ? false , ncurses, openssl ? null, boehmgc, gettext, zlib , imlib2 ? null, x11 ? null, fbcon ? null -, gpm ? null +, gpm-ncurses ? null }: assert sslSupport -> openssl != null; assert graphicsSupport -> imlib2 != null && (x11 != null || fbcon != null); -assert mouseSupport -> gpm != null; +assert mouseSupport -> gpm-ncurses != null; stdenv.mkDerivation rec { name = "w3m-0.5.3"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { buildInputs = [ncurses boehmgc gettext zlib] ++ stdenv.lib.optional sslSupport openssl - ++ stdenv.lib.optional mouseSupport gpm + ++ stdenv.lib.optional mouseSupport gpm-ncurses ++ stdenv.lib.optionals graphicsSupport [imlib2 x11 fbcon]; configureFlags = "--with-ssl=${openssl} --with-gc=${boehmgc}" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 60f73bb7252..6951b924ff7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9650,6 +9650,8 @@ let ncurses = null; # Keep curses disabled for lack of value }; + gpm-ncurses = gpm.override { inherit ncurses; }; + gradm = callPackage ../os-specific/linux/gradm { flex = flex_2_5_35; };