* Latest Compress::Zlib.

* Put the fix for Perl modules that install in the wrong location
  ($out/lib instead of $out/lib/site_perl) in the generic Perl
  builder.

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

3 files changed, 57 insertions, 7 deletions

diff --git a/pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix b/pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix
new file mode 100644
index 000000000000..e83ae68b9544
--- /dev/null
+++ b/pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix
@@ -0,0 +1,20 @@
+{fetchurl, buildPerlPackage, zlib}:
+
+buildPerlPackage rec {
+  name = "Compress-Raw-Zlib-2.015";
+    
+  src = fetchurl {
+    url = "mirror://cpan/authors/id/P/PM/PMQS/${name}.tar.gz";
+    sha256 = "0g6kz73jxqjfln2pi500y7rr96mhad16hrp5wy6542fapamv4xcd";
+  };
+    
+  preConfigure = ''
+    cat > config.in <<EOF
+      BUILD_ZLIB   = False
+      INCLUDE      = ${zlib}/include
+      LIB          = ${zlib}/lib
+      OLD_ZLIB     = False
+      GZIP_OS_CODE = AUTO_DETECT
+    EOF
+  '';
+}
diff --git a/pkgs/development/perl-modules/generic/builder.sh b/pkgs/development/perl-modules/generic/builder.sh
index 6ac5dc5f91b6..f32a0bee2493 100644
--- a/pkgs/development/perl-modules/generic/builder.sh
+++ b/pkgs/development/perl-modules/generic/builder.sh
@@ -38,6 +38,15 @@ postFixup() {
     if test -e $out/nix-support/propagated-build-inputs; then
         ln -s $out/nix-support/propagated-build-inputs $out/nix-support/propagated-user-env-packages
     fi
+
+    # Some (broken?) packages install in $out/lib/${perlVersion}
+    # instead of $out/lib/site_perl/${perlVersion}.  Try to fix that
+    # automatically.
+    if ! test -e $out/lib/site_perl; then
+        echo "fixing wrong Perl installation path..."
+        ensureDir $out/lib/site_perl
+        mv $out/lib/5.* $out/lib/site_perl
+    fi
 }
 
 if test -n "$perlPreHook"; then
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e3e42de41a1f..6ea2722311d4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4569,12 +4569,19 @@ let
     propagatedBuildInputs = [perlClassInspector];
   };
 
-  perlCompressZlib = buildPerlPackage {
-    name = "Compress-Zlib-1.41";
+  perlCompressRawZlib = import ../development/perl-modules/Compress-Raw-Zlib {
+    inherit fetchurl buildPerlPackage zlib;
+  };
+
+  perlCompressZlib = buildPerlPackage rec {
+    name = "Compress-Zlib-2.015";
     src = fetchurl {
-      url = http://nixos.org/tarballs/Compress-Zlib-1.41.tar.gz;
-      md5 = "ac135b84a03e814734496777cf5e5722";
+      url = "mirror://cpan/authors/id/P/PM/PMQS/${name}.tar.gz";
+      sha256 = "1k1i539fszhxay8yllh687sw06i68g8ikw51pvy1c84p3kg6yk4v";
     };
+    propagatedBuildInputs = [
+      perlCompressRawZlib perlIOCompressBase perlIOCompressGzip
+    ];
   };
 
   perlConfigAny = buildPerlPackage {
@@ -5100,6 +5107,23 @@ let
     };
   };
 
+  perlIOCompressBase = buildPerlPackage rec {
+    name = "IO-Compress-Base-2.015";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/P/PM/PMQS/${name}.tar.gz";
+      sha256 = "10njlwa50mhs5nqws5yidfmmb7hwmwc6x06gk2vnpyn82g3szgqd";
+    };
+  };
+
+  perlIOCompressGzip = buildPerlPackage rec {
+    name = "IO-Compress-Zlib-2.015";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/P/PM/PMQS/${name}.tar.gz";
+      sha256 = "0sbnx6xdryaajwpssrfgm5b2zasa4ri8pihqwsx3rm5kmkgzy9cx";
+    };
+    propagatedBuildInputs = [perlIOCompressBase perlCompressRawZlib];
+  };
+
   perlIODigest = buildPerlPackage {
     name = "IO-Digest-0.10";
     src = fetchurl {
@@ -5650,7 +5674,6 @@ let
       sha256 = "0cdl08k5v0wc9w20va5qw98ynlbs9ifwndgsix8qhi7h15sj8a5j";
     };
     propagatedBuildInputs = [perlTestTester perlTestNoWarnings];
-    postInstall = "ensureDir $out/lib/site_perl; mv $out/lib/5.* $out/lib/site_perl";
   };
 
   perlTestException = buildPerlPackage {
@@ -5730,7 +5753,6 @@ let
       sha256 = "030j47q3p46jfk60dsh2d5m7ip4nqz0fl4inqr8hx8b8q0f00r4l";
     };
     propagatedBuildInputs = [perlTestHarness];
-    postInstall = "ensureDir $out/lib/site_perl; mv $out/lib/5.* $out/lib/site_perl";
   };
 
   perlTestTester = buildPerlPackage {
@@ -5739,7 +5761,6 @@ let
       url = mirror://cpan/authors/id/F/FD/FDALY/Test-Tester-0.107.tar.gz;
       sha256 = "0qgmsl6s6xm39211lywyzwrlz0gcmax7fb8zipybs9yxfmwcvyx2";
     };
-    postInstall = "ensureDir $out/lib/site_perl; mv $out/lib/5.* $out/lib/site_perl";
   };
 
   perlTestWarn = buildPerlPackage {