diff --git a/pkgs/applications/networking/browsers/w3m/default.nix b/pkgs/applications/networking/browsers/w3m/default.nix index 3a8b60950db6..aafcaf4d00c9 100644 --- a/pkgs/applications/networking/browsers/w3m/default.nix +++ b/pkgs/applications/networking/browsers/w3m/default.nix @@ -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]; } diff --git a/pkgs/development/libraries/gtk-libs-1.x/gdk-pixbuf/default.nix b/pkgs/development/libraries/gtk-libs-1.x/gdk-pixbuf/default.nix index 4e38cb23a5bf..08f60ceede74 100644 --- a/pkgs/development/libraries/gtk-libs-1.x/gdk-pixbuf/default.nix +++ b/pkgs/development/libraries/gtk-libs-1.x/gdk-pixbuf/default.nix @@ -11,5 +11,6 @@ stdenv.mkDerivation { md5 = "05fcb68ceaa338614ab650c775efc2f2"; }; - buildInputs = [gtk libtiff libjpeg libpng]; + buildInputs = [libtiff libjpeg libpng]; + propagatedBuildInputs = [gtk]; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 28d085a99a41..ccedcb034a97 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 {