* Another sync with the trunk.

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

pkgs/development/tools/misc/icon-naming-utils/default.nix

@@ -1,4 +1,4 @@
-{stdenv, fetchurl, perl, perlXMLSimple}:
+{stdenv, fetchurl, perl, XMLSimple}:
 
 stdenv.mkDerivation {
   name = "icon-naming-utils-0.8.7";
@@ -7,13 +7,13 @@ stdenv.mkDerivation {
     url = http://tango.freedesktop.org/releases/icon-naming-utils-0.8.7.tar.gz;
     sha256 = "1lj0lffdg7fjfinhrn0vsq1kj010dxlxlix4jfc969j6l3k9rd0w";
   };
-
-  buildInputs = [perl perlXMLSimple];
+  
+  buildInputs = [perl XMLSimple];
 
   postInstall = "
     # Add XML::Simple to the runtime search path.
     substituteInPlace $out/libexec/icon-name-mapping \\
-        --replace '/bin/perl' '/bin/perl -I${perlXMLSimple}/lib/perl5/site_perl';
+        --replace '/bin/perl' '/bin/perl -I${XMLSimple}/lib/perl5/site_perl';
     ensureDir $out/lib
     ln -s $out/share/pkgconfig $out/lib/pkgconfig # WTF?
   ";