Merge pull request #139796 from rnhmjoj/privoxy

privoxy: switch to openssl
This commit is contained in:
Michele Guerini Rocco 2021-09-29 07:58:38 +02:00 committed by GitHub
commit a46a8a13de
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -2,7 +2,7 @@
, nixosTests
, fetchurl, autoreconfHook
, zlib, pcre, w3m, man
, mbedtls, brotli
, openssl, brotli
}:
stdenv.mkDerivation rec {
@ -18,11 +18,11 @@ stdenv.mkDerivation rec {
hardeningEnable = [ "pie" ];
nativeBuildInputs = [ autoreconfHook w3m man ];
buildInputs = [ zlib pcre mbedtls brotli ];
buildInputs = [ zlib pcre openssl brotli ];
makeFlags = [ "STRIP=" ];
configureFlags = [
"--with-mbedtls"
"--with-openssl"
"--with-brotli"
"--enable-external-filters"
"--enable-compression"
@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
description = "Non-caching web proxy with advanced filtering capabilities";
# When linked with mbedtls, the license becomes GPLv3 (or later), otherwise
# GPLv2 (or later). See https://www.privoxy.org/user-manual/copyright.html
license = licenses.gpl3Plus;
license = licenses.gpl2Plus;
platforms = platforms.all;
maintainers = [ maintainers.phreedom ];
};