swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-30 00:50:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #167084 from stigtsp/fix/perl-core-zlib

Browse source 
perl: use pkgs.zlib instead of bundled zlib
This commit is contained in:
Janne Heß 2022-04-08 18:53:32 +02:00 committed by GitHub
parent a36cec68d4 d1adf50277
commit f4de52a156
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
pkgs/development/interpreters/perl/default.nix
View file

@ -1,6 +1,7 @@
{ config, lib, stdenv, fetchurl, fetchpatch, fetchFromGitHub, pkgs, buildPackages { config, lib, stdenv, fetchurl, fetchpatch, fetchFromGitHub, pkgs, buildPackages
, callPackage , callPackage
, enableThreading ? true, coreutils, makeWrapper , enableThreading ? true, coreutils, makeWrapper
, zlib
}: }:
# Note: this package is used for bootstrapping fetchurl, and thus # Note: this package is used for bootstrapping fetchurl, and thus
@ -115,6 +116,16 @@ let
cf_by="nixpkgs" cf_by="nixpkgs"
cf_time="$(date -d "@$SOURCE_DATE_EPOCH")" cf_time="$(date -d "@$SOURCE_DATE_EPOCH")"
EOF 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 '' '' + optionalString stdenv.isDarwin ''
substituteInPlace hints/darwin.sh --replace "env MACOSX_DEPLOYMENT_TARGET=10.3" "" substituteInPlace hints/darwin.sh --replace "env MACOSX_DEPLOYMENT_TARGET=10.3" ""
'' + optionalString (!enableThreading) '' '' + optionalString (!enableThreading) ''