Skip to content

lynx: Fix SSL, widec support #26134

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 29, 2017
Merged

lynx: Fix SSL, widec support #26134

merged 2 commits into from
May 29, 2017

Conversation

dtzWill
Copy link
Member

@dtzWill dtzWill commented May 26, 2017

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.

Motivation for this change

nix-built "lynx" doesn't support HTTPS (even when configured to use openSSL, which is the default).

nix-built "lynx" also doesn't handle wide characters currently (unless performing a cross build), so I've changed this to be always enabled instead.

Things done
  • Tested using sandboxing
    (nix.useSandbox on NixOS,
    or option build-use-sandbox in nix.conf
    on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • Linux
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

Sorry, something went wrong.

@mention-bot
Copy link

@dtzWill, thanks for your PR! By analyzing the history of the files in this pull request, we identified @edolstra, @nckx and @peterhoeg to be potential reviewers.

@dtzWill
Copy link
Member Author

dtzWill commented May 26, 2017

All tests pass! 👍


buildInputs = [ ncurses gzip ];
buildInputs = [ ncurses gzip ] ++ stdenv.lib.optionals sslSupport [ openssl.dev pkgconfig ];
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please put pkgconfig into nativeBuildInputs instead.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Eep, of course. Will fix thanks!

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.
@dtzWill dtzWill changed the title lynx: Fix SSL support by letting it use pkgconfig lynx: Fix SSL, widec support May 27, 2017
@dtzWill
Copy link
Member Author

dtzWill commented May 27, 2017

Also fixing lack of widec support.

@peterhoeg peterhoeg merged commit 78b6283 into NixOS:master May 29, 2017
@peterhoeg
Copy link
Member

Thanks @dtzWill

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants