* Set PERL5LIB automatically in the Perl setup hook.

* Remove explicit setting of PERL5LIB.
* Use the generic Perl builder for the BerkeleyDB and XML::Parser
  modules.
* Prefix all names of Perl modules with `perl-' (in the generic Perl
  builder).

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

pkgs/development/perl-modules/XML-Parser/builder.sh

@@ -1,10 +0,0 @@
-buildinputs="$perl $expat"
-. $stdenv/setup || exit 1
-
-tar xvfz $src || exit 1
-cd XML-Parser-* || exit 1
-
-perl Makefile.PL EXPATLIBPATH=$expat/lib EXPATINCPATH=$expat/include \
-  SITEPREFIX=$out PERLPREFIX=$out || exit 1
-make || exit 1
-make install || exit 1

pkgs/development/perl-modules/XML-Parser/default.nix

@@ -1,14 +1,11 @@
-{stdenv, fetchurl, perl, expat}:
+{fetchurl, perl, expat}:
 
-assert perl != null && expat != null;
-
-stdenv.mkDerivation {
-  name = "perl-XML-Parser-2.34";
-  builder = ./builder.sh;
+import ../generic perl {
+  name = "XML-Parser-2.34";
   src = fetchurl {
     url = http://catamaran.labs.cs.uu.nl/dist/tarballs/XML-Parser-2.34.tar.gz;
     md5 = "84d9e0001fe01c14867256c3fe115899";
   };
-  perl = perl;
-  expat = expat;
+  perlPreHook = ./hook.sh;
+  inherit expat;
 }

pkgs/development/perl-modules/XML-Parser/hook.sh

@@ -0,0 +1 @@
+makeMakerFlags="EXPATLIBPATH=$expat/lib EXPATINCPATH=$expat/include"