From e3d262e0d4abe85e3e165641ab258f447a0dbe78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 23 Aug 2018 22:02:34 +0100 Subject: [PATCH] tor: fix build by upgrading openssl One test segfaulted with openssl_1_0_x. openssl_1_1 seems to work fine. As libevent still uses openssl_1_0_x we disable ssl support there to avoid having to different ssl versions linked into tor. Longterm it would be a better solution to upgrade openssl also in libevent. But this would require more testing/time as we have many dependent packages of libevent and we would probably need turn to on openssl 1.1 by default globally. After all libevent is rather small compared to tor. --- pkgs/top-level/all-packages.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 83def493803..12d5c542c43 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5527,7 +5527,13 @@ with pkgs; tokei = callPackage ../development/tools/misc/tokei { }; - tor = callPackage ../tools/security/tor { }; + tor = callPackage ../tools/security/tor { + openssl = openssl_1_1_0; + # remove this, when libevent's openssl is upgraded to 1_1_0 or newer. + libevent = libevent.override { + sslSupport = false; + }; + }; tor-arm = callPackage ../tools/security/tor/tor-arm.nix { };