From fee41ba2fb84e6c7a1c7d59d672e22cac421cf12 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 26 Aug 2010 13:09:52 +0000
Subject: [PATCH] * Make sitecopy build against Neon 0.29.

svn path=/nixpkgs/trunk/; revision=23461
---
 pkgs/tools/networking/sitecopy/default.nix | 12 ++++++++----
 pkgs/top-level/all-packages.nix            |  4 +---
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/networking/sitecopy/default.nix b/pkgs/tools/networking/sitecopy/default.nix
index 931f70afb2e8..6beaff56aeab 100644
--- a/pkgs/tools/networking/sitecopy/default.nix
+++ b/pkgs/tools/networking/sitecopy/default.nix
@@ -1,14 +1,18 @@
-{stdenv, fetchurl, neon, openssl}:
+{ stdenv, fetchurl, neon, zlib, openssl, autoconf, automake, libtool }:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "sitecopy-0.16.6";
 
   src = fetchurl {
-    url = http://www.manyfish.co.uk/sitecopy/sitecopy-0.16.6.tar.gz;
+    url = "http://www.manyfish.co.uk/sitecopy/${name}.tar.gz";
     sha256 = "1bsqfhfq83g1qambqf8i1ivvggz5d2byg94hmrpxqkg50yhdsvz0";
   };
 
-  buildInputs = [openssl]; 
+  patches = [ ./neon-29.patch ];
+
+  preConfigure = "autoreconf";
+
+  buildInputs = [ openssl neon zlib autoconf automake libtool ]; 
 
   configureFlags= "--with-ssl=openssl"; 
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9a2d9a99a006..acb9e21fd985 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1161,9 +1161,7 @@ let
 
   system_config_printer = callPackage ../tools/misc/system-config-printer { };
 
-  sitecopy = callPackage ../tools/networking/sitecopy {
-    neon = neon026;
-  };
+  sitecopy = callPackage ../tools/networking/sitecopy { };
 
   privoxy = callPackage ../tools/networking/privoxy {
     autoconf = autoconf213;