w3m: Add support for fbcon image display.

This builds the w3m image helper with fbcon support if the derivation is called
with graphicsSupport set to true. This change shouldn't break anything as
graphicsSupport is disabled by default, so in any case it could only break
things for users explicitly passing the attribute.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>

1 files changed, 5 insertions, 4 deletions

diff --git a/pkgs/applications/networking/browsers/w3m/default.nix b/pkgs/applications/networking/browsers/w3m/default.nix
index 2a05e920d5f1..9dc7116234e7 100644
--- a/pkgs/applications/networking/browsers/w3m/default.nix
+++ b/pkgs/applications/networking/browsers/w3m/default.nix
@@ -2,11 +2,11 @@
 , sslSupport ? true
 , graphicsSupport ? false
 , ncurses, openssl ? null, boehmgc, gettext, zlib
-, imlib2 ? null, x11 ? null
+, imlib2 ? null, x11 ? null, fbcon ? null
 }:
 
 assert sslSupport -> openssl != null;
-assert graphicsSupport -> x11 != null;
+assert graphicsSupport -> imlib2 != null && (x11 != null || fbcon != null);
 
 stdenv.mkDerivation rec {
   name = "w3m-0.5.3";
@@ -22,9 +22,10 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ncurses boehmgc gettext zlib]
     ++ stdenv.lib.optional sslSupport openssl
-    ++ stdenv.lib.optionals graphicsSupport [imlib2 x11];
+    ++ stdenv.lib.optionals graphicsSupport [imlib2 x11 fbcon];
 
-  configureFlags = "--with-ssl=${openssl} --with-gc=${boehmgc}";
+  configureFlags = "--with-ssl=${openssl} --with-gc=${boehmgc}"
+    + stdenv.lib.optionalString graphicsSupport " --enable-image=x11,fb";
 
   preConfigure = ''
     substituteInPlace ./configure --replace "/lib /usr/lib /usr/local/lib /usr/ucblib /usr/ccslib /usr/ccs/lib /lib64 /usr/lib64" /no-such-path