From cd48c1b4960a39927e957d9c6435d2b9c10ace35 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 22 Oct 2008 19:25:01 +0000
Subject: [PATCH] * Unbreak the DB_File / BerkeleyDB Perl modules.

svn path=/nixpkgs/trunk/; revision=13102
---
 pkgs/development/perl-modules/BerkeleyDB/default.nix | 10 +++++++---
 pkgs/development/perl-modules/BerkeleyDB/hook.sh     |  7 -------
 pkgs/development/perl-modules/DB_File/default.nix    | 12 +++++++++++-
 pkgs/development/perl-modules/DB_File/hook.sh        | 11 -----------
 4 files changed, 18 insertions(+), 22 deletions(-)
 delete mode 100644 pkgs/development/perl-modules/BerkeleyDB/hook.sh
 delete mode 100644 pkgs/development/perl-modules/DB_File/hook.sh

diff --git a/pkgs/development/perl-modules/BerkeleyDB/default.nix b/pkgs/development/perl-modules/BerkeleyDB/default.nix
index 24423fb359f..59826ee8a44 100644
--- a/pkgs/development/perl-modules/BerkeleyDB/default.nix
+++ b/pkgs/development/perl-modules/BerkeleyDB/default.nix
@@ -2,10 +2,14 @@
 
 import ../generic perl {
   name = "BerkeleyDB-0.27";
+  
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/BerkeleyDB-0.27.tar.gz;
+    url = http://nixos.org/tarballs/BerkeleyDB-0.27.tar.gz;
     md5 = "43aa72c0c6941af0d656d749ad543e96";
   };
-  perlPreHook = "source ${./hook.sh}";
-  inherit db4;
+
+  preConfigure = ''
+    echo "LIB = ${db4}/lib" > config.in
+    echo "INCLUDE = ${db4}/include" >> config.in
+  '';
 }
diff --git a/pkgs/development/perl-modules/BerkeleyDB/hook.sh b/pkgs/development/perl-modules/BerkeleyDB/hook.sh
deleted file mode 100644
index c0735d27e9f..00000000000
--- a/pkgs/development/perl-modules/BerkeleyDB/hook.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-oldPreConfigure=$preConfigure
-preConfigure=myPreConfigure
-myPreConfigure() {
-    echo "LIB = $db4/lib" > config.in
-    echo "INCLUDE = $db4/include" >> config.in
-    $oldPreConfigure
-}
diff --git a/pkgs/development/perl-modules/DB_File/default.nix b/pkgs/development/perl-modules/DB_File/default.nix
index 339093625f6..f9074335004 100644
--- a/pkgs/development/perl-modules/DB_File/default.nix
+++ b/pkgs/development/perl-modules/DB_File/default.nix
@@ -2,10 +2,20 @@
 
 import ../generic perl {
   name = "DB_File-1.816";
+  
   src = fetchurl {
     url = mirror://cpan/authors/id/P/PM/PMQS/DB_File-1.816.tar.gz;
     sha256 = "1a668hk5v0l180kbqss2hq9khl756cmrykn8fz1rl4qzsp6lq284";
   };
-  perlPreHook = "source ${./hook.sh}";
+
+  preConfigure = ''
+    cat > config.in <<EOF
+    PREFIX = size_t
+    HASH = u_int32_t
+    LIB = ${db4}/lib
+    INCLUDE = ${db4}/include
+    EOF
+  '';
+  
   inherit db4;
 }
diff --git a/pkgs/development/perl-modules/DB_File/hook.sh b/pkgs/development/perl-modules/DB_File/hook.sh
deleted file mode 100644
index 033de2fd5db..00000000000
--- a/pkgs/development/perl-modules/DB_File/hook.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-oldPreConfigure=$preConfigure
-preConfigure=myPreConfigure
-myPreConfigure() {
-    cat > config.in <<EOF
-PREFIX = size_t
-HASH = u_int32_t
-LIB = $db4/lib
-INCLUDE = $db4/include
-EOF
-    $oldPreConfigure
-}