diff options
author | Will Dietz <github@wdtz.org> | 2017-05-29 02:14:02 -0500 |
---|---|---|
committer | Peter Hoeg <peter@hoeg.com> | 2017-05-29 15:14:02 +0800 |
commit | 78b62836f5cd02626ffaff7f05071e19368f2ea8 (patch) | |
tree | 7aa255726e002300a001f0c44c796a518a9b9578 | |
parent | 03ba5ef6d3d45d140dbb233beabfbadc94da4283 (diff) | |
download | nixlib-78b62836f5cd02626ffaff7f05071e19368f2ea8.tar nixlib-78b62836f5cd02626ffaff7f05071e19368f2ea8.tar.gz nixlib-78b62836f5cd02626ffaff7f05071e19368f2ea8.tar.bz2 nixlib-78b62836f5cd02626ffaff7f05071e19368f2ea8.tar.lz nixlib-78b62836f5cd02626ffaff7f05071e19368f2ea8.tar.xz nixlib-78b62836f5cd02626ffaff7f05071e19368f2ea8.tar.zst nixlib-78b62836f5cd02626ffaff7f05071e19368f2ea8.zip |
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.
-rw-r--r-- | pkgs/applications/networking/browsers/lynx/default.nix | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/pkgs/applications/networking/browsers/lynx/default.nix b/pkgs/applications/networking/browsers/lynx/default.nix index fb4b33ef71ab..42f454191989 100644 --- a/pkgs/applications/networking/browsers/lynx/default.nix +++ b/pkgs/applications/networking/browsers/lynx/default.nix @@ -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/; |