diff options
| -rw-r--r-- | pkgs/tools/networking/privoxy/default.nix | 15 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 10 insertions, 9 deletions
diff --git a/pkgs/tools/networking/privoxy/default.nix b/pkgs/tools/networking/privoxy/default.nix index 6fff52c63bd..c6a57c238a4 100644 --- a/pkgs/tools/networking/privoxy/default.nix +++ b/pkgs/tools/networking/privoxy/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, autoconf, automake, zlib, pcre, w3m}: +{ stdenv, fetchurl, autoreconfHook, zlib, pcre, w3m, man }: stdenv.mkDerivation { name = "privoxy-3.0.21"; @@ -8,10 +8,13 @@ stdenv.mkDerivation { sha256 = "1f6xb7aa47p90c26vqaw74y6drs9gpnhxsgby3mx0awdjh0ydisy"; }; - buildInputs = [automake autoconf zlib pcre w3m]; + buildInputs = [ autoreconfHook zlib pcre w3m man ]; - preConfigure = '' - autoheader - autoconf - ''; + meta = with stdenv.lib; { + homepage = http://www.privoxy.org/; + description = "Non-caching web proxy with advanced filtering capabilities"; + license = licenses.gpl2; + platforms = platforms.all; + maintainers = [ maintainers.phreedom ]; + }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7461f093de4..e107812ef9a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1868,9 +1868,7 @@ let sitecopy = callPackage ../tools/networking/sitecopy { }; - privoxy = callPackage ../tools/networking/privoxy { - autoconf = autoconf213; - }; + privoxy = callPackage ../tools/networking/privoxy { }; tarsnap = callPackage ../tools/backup/tarsnap { }; |