diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2020-04-16 10:09:43 +0200 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2020-04-16 10:09:43 +0200 |
| commit | 3d8e43691731037672c36129cbecb2fe43ffad7e (patch) | |
| tree | c7f5fe5732dd22a66330d041ee7b0139f75b412d /pkgs/development/libraries/openssl | |
| parent | a04625379a9e842cb987197c4f273de1bea807b7 (diff) | |
| parent | 342eaba9ebbc68923c1028a56be1c94e74862832 (diff) | |
| download | nixlib-3d8e43691731037672c36129cbecb2fe43ffad7e.tar nixlib-3d8e43691731037672c36129cbecb2fe43ffad7e.tar.gz nixlib-3d8e43691731037672c36129cbecb2fe43ffad7e.tar.bz2 nixlib-3d8e43691731037672c36129cbecb2fe43ffad7e.tar.lz nixlib-3d8e43691731037672c36129cbecb2fe43ffad7e.tar.xz nixlib-3d8e43691731037672c36129cbecb2fe43ffad7e.tar.zst nixlib-3d8e43691731037672c36129cbecb2fe43ffad7e.zip | |
Merge branch 'master' into staging-next
Diffstat (limited to 'pkgs/development/libraries/openssl')
| -rw-r--r-- | pkgs/development/libraries/openssl/default.nix | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index e8cbfd8d5224..d821a6c8f512 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -1,6 +1,7 @@ { stdenv, fetchurl, buildPackages, perl, coreutils , withCryptodev ? false, cryptodev , enableSSL2 ? false +, enableSSL3 ? false , static ? false }: @@ -76,6 +77,7 @@ let "-DHAVE_CRYPTODEV" "-DUSE_CRYPTODEV_DIGESTS" ] ++ stdenv.lib.optional enableSSL2 "enable-ssl2" + ++ stdenv.lib.optional enableSSL3 "enable-ssl3" ++ stdenv.lib.optional (versionAtLeast version "1.1.0" && stdenv.hostPlatform.isAarch64) "no-afalgeng" # OpenSSL needs a specific `no-shared` configure flag. # See https://wiki.openssl.org/index.php/Compilation_and_Installation#Configure_Options @@ -164,5 +166,4 @@ in { ]; withDocs = true; }; - } |