* Graphics support in w3m. Must be seen to be believed. Disabled by

default; set graphicsSupport to true in all-packages.nix to enable.

svn path=/nixpkgs/trunk/; revision=5237
This commit is contained in:
Eelco Dolstra 2006-04-28 19:02:52 +00:00
parent e710b4b795
commit 01ca1e7fef
3 changed files with 15 additions and 5 deletions

View file

@ -1,8 +1,11 @@
{ stdenv, fetchurl, ncurses
, sslSupport ? true, openssl ? null, boehmgc, gettext
{ stdenv, fetchurl
, sslSupport ? true
, graphicsSupport ? false
, ncurses, openssl ? null, boehmgc, gettext, zlib, gdkpixbuf ? null
}:
assert sslSupport -> openssl != null;
assert graphicsSupport -> gdkpixbuf != null;
stdenv.mkDerivation {
name = "w3m-0.5.1";
@ -12,6 +15,10 @@ stdenv.mkDerivation {
md5 = "0678b72e07e69c41709d71ef0fe5da13";
};
inherit openssl boehmgc;
buildInputs = [ncurses (if sslSupport then openssl else null) boehmgc gettext];
buildInputs = [
ncurses boehmgc gettext zlib
(if sslSupport then openssl else null)
(if graphicsSupport then gdkpixbuf else null)
];
patches = [./bsd.patch];
}

View file

@ -11,5 +11,6 @@ stdenv.mkDerivation {
md5 = "05fcb68ceaa338614ab650c775efc2f2";
};
buildInputs = [gtk libtiff libjpeg libpng];
buildInputs = [libtiff libjpeg libpng];
propagatedBuildInputs = [gtk];
}

View file

@ -2034,7 +2034,9 @@ rec {
};
w3m = (import ../applications/networking/browsers/w3m) {
inherit fetchurl stdenv ncurses openssl boehmgc gettext;
inherit fetchurl stdenv ncurses openssl boehmgc gettext zlib;
graphicsSupport = false;
inherit (gtkLibs1x) gdkpixbuf;
};
opera = import ../applications/networking/browsers/opera {