diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 75ffe5ae06a6..efa19a2ce197 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -1,5 +1,6 @@ { lib, stdenv, fetchurl, buildPackages, perl, coreutils , withCryptodev ? false, cryptodev +, withZlib ? false, zlib , enableSSL2 ? false , enableSSL3 ? false , static ? stdenv.hostPlatform.isStatic @@ -75,7 +76,8 @@ let buildInputs = lib.optional withCryptodev cryptodev # perl is included to allow the interpreter path fixup hook to set the # correct interpreter in c_rehash. - ++ lib.optional withPerl perl; + ++ lib.optional withPerl perl + ++ lib.optional withZlib zlib; # TODO(@Ericson2314): Improve with mass rebuild configurePlatforms = []; @@ -142,6 +144,7 @@ let # This introduces a reference to the CTLOG_FILE which is undesired when # trying to build binaries statically. ++ lib.optional static "no-ct" + ++ lib.optional withZlib "zlib" ; makeFlags = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 361eacc84d3b..0bf35d5c279d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12253,7 +12253,9 @@ with pkgs; sshpass = callPackage ../tools/networking/sshpass { }; - sslscan = callPackage ../tools/security/sslscan { }; + sslscan = callPackage ../tools/security/sslscan { + openssl = openssl.override { withZlib = true; }; + }; sslmate = callPackage ../development/tools/sslmate { };