* 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/applications/editors/monodevelop/builder.sh

@@ -1,8 +1,6 @@
 . $stdenv/setup
 . $makeWrapper
 
-export PERL5LIB=$perlXMLParser/lib/site_perl:$PERL5LIB
-
 export MONO_GAC_PREFIX=$monodoc:$gtksharp
 
 postInstall=postInstall

pkgs/applications/editors/monodevelop/default.nix

@@ -19,11 +19,10 @@ stdenv.mkDerivation {
   patches = [./prefix.patch];
   
   buildInputs = [
-    file mono gtksharp gtksourceviewsharp perl pkgconfig
+    file mono gtksharp gtksourceviewsharp perl perlXMLParser pkgconfig
     glib gtk gconf gnomevfs libbonobo libglade libgnome
     gtkmozembedsharp monodoc
   ];
   
-  inherit perlXMLParser mozilla monodoc
-    gtksharp gtkmozembedsharp gtksourceviewsharp;
+  inherit mozilla monodoc gtksharp gtkmozembedsharp gtksourceviewsharp;
 }

pkgs/applications/video/zapping/builder.sh

@@ -1,7 +1,5 @@
 . $stdenv/setup
 
-export PERL5LIB=$perlXMLParser/lib/site_perl:$PERL5LIB
-
 # !!! hack
 NIX_LDFLAGS="$NIX_LDFLAGS -rpath $libXext/lib"
 

pkgs/applications/video/zapping/default.nix

@@ -29,10 +29,10 @@ stdenv.mkDerivation {
     md5 = "dd7b3d920509709692c41c9c6c767746";
   };
 
-  inherit teletextSupport jpegSupport pngSupport libXext perlXMLParser;
+  inherit teletextSupport jpegSupport pngSupport libXext;
 
   buildInputs = [
-    pkgconfig perl python x11 libXv libXmu libgnomeui
+    pkgconfig perl perlXMLParser python x11 libXv libXmu libgnomeui
     libglade scrollkeeper esound gettext
     (if teletextSupport then zvbi else null)
     (if jpegSupport then libjpeg else null)