From 7fd9d4bda7f5b1fb89978a5c668bf33881756068 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Wed, 3 Mar 2021 14:09:27 +0100 Subject: [PATCH] privoxy: enable more useful features This cause ~6MB of closure size increase. --- pkgs/tools/networking/privoxy/default.nix | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/networking/privoxy/default.nix b/pkgs/tools/networking/privoxy/default.nix index 85a8cd5d768..7a6cf697a94 100644 --- a/pkgs/tools/networking/privoxy/default.nix +++ b/pkgs/tools/networking/privoxy/default.nix @@ -1,4 +1,8 @@ -{ lib, stdenv, fetchurl, autoreconfHook, zlib, pcre, w3m, man }: +{ lib, stdenv +, fetchurl, autoreconfHook +, zlib, pcre, w3m, man +, mbedtls, brotli +}: stdenv.mkDerivation rec { @@ -13,18 +17,26 @@ stdenv.mkDerivation rec { hardeningEnable = [ "pie" ]; nativeBuildInputs = [ autoreconfHook w3m man ]; - buildInputs = [ zlib pcre ]; + buildInputs = [ zlib pcre mbedtls brotli ]; - makeFlags = [ "STRIP="]; + makeFlags = [ "STRIP=" ]; + configureFlags = [ + "--with-mbedtls" + "--with-brotli" + "--enable-external-filters" + "--enable-compression" + ]; postInstall = '' - rm -rf $out/var + rm -r $out/var ''; meta = with lib; { homepage = "https://www.privoxy.org/"; description = "Non-caching web proxy with advanced filtering capabilities"; - license = licenses.gpl2Plus; + # 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; platforms = platforms.all; maintainers = [ maintainers.phreedom ]; };