diff options
| author | Janne Heß <janne@hess.ooo> | 2022-04-08 18:53:32 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-08 18:53:32 +0200 |
| commit | f4de52a156c0dc4bd540954c053892a3689a88a2 (patch) | |
| tree | e8951b78f39c0400e7e4a21d1222371871ef1384 /pkgs/development/interpreters/perl | |
| parent | a36cec68d4c748e9e525ef6fbb56650738eb18e1 (diff) | |
| parent | d1adf502779a07dfc602d12e40116249b3dabb00 (diff) | |
Merge pull request #167084 from stigtsp/fix/perl-core-zlib
perl: use pkgs.zlib instead of bundled zlib
Diffstat (limited to 'pkgs/development/interpreters/perl')
| -rw-r--r-- | pkgs/development/interpreters/perl/default.nix | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix index f29e61d1105b..81099b967452 100644 --- a/pkgs/development/interpreters/perl/default.nix +++ b/pkgs/development/interpreters/perl/default.nix @@ -1,6 +1,7 @@ { config, lib, stdenv, fetchurl, fetchpatch, fetchFromGitHub, pkgs, buildPackages , callPackage , enableThreading ? true, coreutils, makeWrapper +, zlib }: # Note: this package is used for bootstrapping fetchurl, and thus @@ -115,6 +116,16 @@ let cf_by="nixpkgs" cf_time="$(date -d "@$SOURCE_DATE_EPOCH")" EOF + + # Compress::Raw::Zlib should use our zlib package instead of the one + # included with the distribution + cat > ./cpan/Compress-Raw-Zlib/config.in <<EOF + BUILD_ZLIB = False + INCLUDE = ${zlib.dev}/include + LIB = ${zlib.out}/lib + OLD_ZLIB = False + GZIP_OS_CODE = AUTO_DETECT + EOF '' + optionalString stdenv.isDarwin '' substituteInPlace hints/darwin.sh --replace "env MACOSX_DEPLOYMENT_TARGET=10.3" "" '' + optionalString (!enableThreading) '' |