From 86f9f5d128306a37649cf13a687b231df18a03ca Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 12 Jun 2015 13:53:53 -0700 Subject: [PATCH] perl: Don't use builtin zlib and bzip2 --- pkgs/development/interpreters/perl/5.20/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/perl/5.20/default.nix b/pkgs/development/interpreters/perl/5.20/default.nix index 0ad955d03630..053f9730f45d 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, enableThreading ? stdenv ? glibc }: +{ stdenv, fetchurl, bzip2, zlib, enableThreading ? stdenv ? glibc }: # We can only compile perl with threading on platforms where we have a # real glibc in the stdenv. @@ -33,7 +33,12 @@ stdenv.mkDerivation rec { ./no-sys-dirs.patch ] ++ optional stdenv.isSunOS ./ld-shared.patch - ++ stdenv.lib.optional stdenv.isDarwin [ ./cpp-precomp.patch ./no-libutil.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