Revert "perl: Don't use builtin zlib and bzip2"

This reverts commit 86f9f5d128306a37649cf13a687b231df18a03ca.

2 files changed, 3 insertions, 13 deletions

diff --git a/pkgs/development/interpreters/perl/5.20/default.nix b/pkgs/development/interpreters/perl/5.20/default.nix
index 700616dd4ebf..7651bc15f469 100644
--- a/pkgs/development/interpreters/perl/5.20/default.nix
+++ b/pkgs/development/interpreters/perl/5.20/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, bzip2, zlib, enableThreading ? stdenv ? glibc }:
+{ stdenv, fetchurl, enableThreading ? stdenv ? glibc }:
 
 # We can only compile perl with threading on platforms where we have a
 # real glibc in the stdenv.
@@ -35,12 +35,7 @@ stdenv.mkDerivation rec {
       ./perl-5.20.2-gcc5_fixes-1.patch
     ]
     ++ optional stdenv.isSunOS ./ld-shared.patch
-    ++ stdenv.lib.optional stdenv.isDarwin [ ./cpp-precomp.patch ./no-libutil.patch ];
-
-  buildInputs = [ zlib bzip2 ];
-
-  BUILD_ZLIB = "false";
-  BUILD_BZIP2 = "0";
+    ++ stdenv.lib.optional stdenv.isDarwin [ ./cpp-precomp.patch ./no-libutil.patch ] ;
 
   # Build a thread-safe Perl with a dynamic libperls.o.  We need the
   # "installstyle" option to ensure that modules are put under
diff --git a/pkgs/development/interpreters/perl/5.22/default.nix b/pkgs/development/interpreters/perl/5.22/default.nix
index b7aad858ccfb..f9068de1c2cf 100644
--- a/pkgs/development/interpreters/perl/5.22/default.nix
+++ b/pkgs/development/interpreters/perl/5.22/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, bzip2, zlib, enableThreading ? stdenv ? glibc }:
+{ stdenv, fetchurl, enableThreading ? stdenv ? glibc }:
 
 # We can only compile perl with threading on platforms where we have a
 # real glibc in the stdenv.
@@ -35,11 +35,6 @@ stdenv.mkDerivation rec {
     ++ optional stdenv.isSunOS ./ld-shared.patch
     ++ stdenv.lib.optional stdenv.isDarwin [ ./cpp-precomp.patch ./no-libutil.patch ];
 
-  buildInputs = [ zlib bzip2 ];
-
-  BUILD_ZLIB = "false";
-  BUILD_BZIP2 = "0";
-
   # Build a thread-safe Perl with a dynamic libperls.o.  We need the
   # "installstyle" option to ensure that modules are put under
   # $out/lib/perl5 - this is the general default, but because $out