* Subversion 1.4.0. Note: Subversion 1.4 upgrades your working

  copies, so it's hard to go back to 1.3.

svn path=/nixpkgs/trunk/; revision=6486

1 files changed, 5 insertions, 5 deletions

diff --git a/pkgs/development/libraries/apr-util/default.nix b/pkgs/development/libraries/apr-util/default.nix
index 5ffc92ae93d..7f2ce3e3882 100644
--- a/pkgs/development/libraries/apr-util/default.nix
+++ b/pkgs/development/libraries/apr-util/default.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchurl, apr, expat
-, bdbSupport ? false, bdb ? null
+, bdbSupport ? false, db4 ? null
 }:
 
-assert bdbSupport -> bdb != null;
+assert bdbSupport -> db4 != null;
 
-stdenv.mkDerivation {
+(stdenv.mkDerivation {
   name = "apr-util-1.2.7";
   src = fetchurl {
     url = http://archive.apache.org/dist/apr/apr-util-1.2.7.tar.bz2;
@@ -12,6 +12,6 @@ stdenv.mkDerivation {
   };
   configureFlags = "
     --with-apr=${apr} --with-expat=${expat}
-    ${if bdbSupport then "--with-berkeley-db=${bdb}" else ""}
+    ${if bdbSupport then "--with-berkeley-db=${db4}" else ""}
   ";
-}
+}) // {inherit bdbSupport;}