diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2017-12-11 09:49:56 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2017-12-11 09:49:56 +0100 |
| commit | e9c12f6936b877eb707203f12170bac85255db50 (patch) | |
| tree | aeaa4249ddf5e1a0094d7d32e5f503a8363b8d4c /pkgs/development/interpreters | |
| parent | d1c9beebdbf22aa04419a1fe412c43160552aef7 (diff) | |
| parent | 2309acf72337b49eef43d1dfc90d850d2682a4a5 (diff) | |
| download | nixlib-e9c12f6936b877eb707203f12170bac85255db50.tar nixlib-e9c12f6936b877eb707203f12170bac85255db50.tar.gz nixlib-e9c12f6936b877eb707203f12170bac85255db50.tar.bz2 nixlib-e9c12f6936b877eb707203f12170bac85255db50.tar.lz nixlib-e9c12f6936b877eb707203f12170bac85255db50.tar.xz nixlib-e9c12f6936b877eb707203f12170bac85255db50.tar.zst nixlib-e9c12f6936b877eb707203f12170bac85255db50.zip | |
Merge older staging
There are some regressions, but not that many and I want the security update of openssl fast.
Diffstat (limited to 'pkgs/development/interpreters')
| -rw-r--r-- | pkgs/development/interpreters/perl/default.nix | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix index d2fff13e2ee4..7b0ecee1922d 100644 --- a/pkgs/development/interpreters/perl/default.nix +++ b/pkgs/development/interpreters/perl/default.nix @@ -35,6 +35,12 @@ let [ # Do not look in /usr etc. for dependencies. ./no-sys-dirs.patch ] + ++ optional (versionAtLeast version "5.24") ( + # Fix parallel building: https://rt.perl.org/Public/Bug/Display.html?id=132360 + fetchurlBoot { + url = "https://rt.perl.org/Public/Ticket/Attachment/1502646/807252/0001-Fix-missing-build-dependency-for-pods.patch"; + sha256 = "1bb4mldfp8kq1scv480wm64n2jdsqa3ar46cjp1mjpby8h5dr2r0"; + }) ++ optional stdenv.isSunOS ./ld-shared.patch ++ optional stdenv.isDarwin ./cpp-precomp.patch ++ optional (stdenv.isDarwin && versionAtLeast version "5.24") ./sw_vers.patch; |