public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This reverts commit 86f9f5d128.
This commit is contained in:
William A. Kennington III 2015-06-13 10:28:42 -07:00
parent 8c2a8661eb
commit 354e5af036
2 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/development/interpreters/perl/5.20/default.nix
View File

@ -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

7
pkgs/development/interpreters/perl/5.22/default.nix
View File

@ -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