lynx: Fix SSL, widec support (#26134)

* lynx: Fix SSL support by letting it use pkgconfig

lynx wants both the "include" and "lib/lib*.so" paths
to be children of the path given to "--with-ssl",
which is not provided by any of the current openssl outputs.

To fix lynx so it supports SSL (and https URLs),
let it use pkgconfig to figure out where openssl's bits are.

* lynx: Always enable widec support.
This commit is contained in:
Will Dietz 2017-05-29 02:14:02 -05:00 committed by Peter Hoeg
parent 03ba5ef6d3
commit 78b62836f5

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, ncurses, gzip
{ stdenv, fetchurl, ncurses, gzip, pkgconfig
, sslSupport ? true, openssl ? null
}:
@ -13,14 +13,10 @@ stdenv.mkDerivation rec {
sha256 = "1cqm1i7d209brkrpzaqqf2x951ra3l67dw8x9yg10vz7rpr9441a";
};
configureFlags = []
++ stdenv.lib.optionals sslSupport [ "--with-ssl=${openssl.dev}" ];
configureFlags = [ "--enable-widec" ] ++ stdenv.lib.optional sslSupport "--with-ssl";
buildInputs = [ ncurses gzip ];
crossAttrs = {
configureFlags = configureFlags ++ [ "--enable-widec" ];
};
nativeBuildInputs = stdenv.lib.optional sslSupport pkgconfig;
buildInputs = [ ncurses gzip ] ++ stdenv.lib.optional sslSupport openssl.dev;
meta = with stdenv.lib; {
homepage = http://lynx.isc.org/;