From 09bb1e1116346bcbb746f6256dad55eceb2b7790 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Thu, 12 Feb 2009 14:52:23 +0000
Subject: [PATCH] Updated log4cxx to version 0.10.0 by using a patch from
 Andrew Morsillo

svn path=/nixpkgs/trunk/; revision=14039
---
 pkgs/development/libraries/log4cxx/default.nix | 16 ++++++++--------
 pkgs/top-level/all-packages.nix                |  1 +
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/log4cxx/default.nix b/pkgs/development/libraries/log4cxx/default.nix
index 63f32c05bc77..c7a66b22c51e 100644
--- a/pkgs/development/libraries/log4cxx/default.nix
+++ b/pkgs/development/libraries/log4cxx/default.nix
@@ -1,11 +1,11 @@
-args: with args;
+{stdenv, fetchurl, autoconf, automake, libtool, libxml2, cppunit, boost,
+ apr, aprutil, db45, expat}:
 
 stdenv.mkDerivation {
-	name = "log4cxx-0.9.7";
-	src = fetchurl {
-		url = http://archive.apache.org/dist/logging/log4cxx/log4cxx-0.9.7.tar.gz;
-		sha256 = "1ikyxd8jgf7b2cqjk5lidl7cffs114iiblaczaqbv5bm4vyb4hav";
-	};
-	buildInputs = [ autoconf automake libtool libxml2 cppunit boost ];
-	patchPhase = "sh autogen.sh; sed -e 's/DOMConfigurator::subst/subst/' -i include/log4cxx/xml/domconfigurator.h";
+  name = "log4cxx-0.10.0";
+  src = fetchurl {
+    url = http://apache.mirrors.hoobly.com/logging/log4cxx/0.10.0/apache-log4cxx-0.10.0.tar.gz;    
+    sha256 = "130cjafck1jlqv92mxbn47yhxd2ccwwnprk605c6lmm941i3kq0d";
+  };
+  buildInputs = [ autoconf automake libtool libxml2 cppunit boost apr aprutil db45 expat];
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cc86a16b029c..8a88f54e483d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3484,6 +3484,7 @@ let
 
   log4cxx = import ../development/libraries/log4cxx {
     inherit fetchurl stdenv automake autoconf libtool cppunit libxml2 boost;
+    inherit apr aprutil db45 expat;
   };
 
   loudmouth = import ../development/libraries/loudmouth {