* Another sync with the trunk.

svn path=/nixpkgs/branches/stdenv-updates/; revision=15269

pkgs/development/perl-modules/DBD-SQLite/default.nix

@@ -1,4 +1,4 @@
-{fetchurl, buildPerlPackage, perlDBI, sqlite}:
+{fetchurl, buildPerlPackage, DBI, sqlite}:
 
 buildPerlPackage {
   name = "DBD-SQLite-1.14";
@@ -8,7 +8,7 @@ buildPerlPackage {
     sha256 = "01qd5xfx702chg3bv2k727kfdp84zy5xh31y6njvivkp78vrs624";
   };
   
-  propagatedBuildInputs = [perlDBI];
+  propagatedBuildInputs = [DBI];
   
   makeMakerFlags = "SQLITE_LOCATION=${sqlite}";
 

pkgs/development/perl-modules/DB_File/default.nix

@@ -1,6 +1,6 @@
-{fetchurl, perl, db4}:
+{fetchurl, buildPerlPackage, db4}:
 
-import ../generic perl {
+buildPerlPackage {
   name = "DB_File-1.816";
   
   src = fetchurl {
@@ -16,6 +16,4 @@ import ../generic perl {
     INCLUDE = ${db4}/include
     EOF
   '';
-  
-  inherit db4;
 }