diff options
Diffstat (limited to 'pkgs/development/interpreters/perl/5.20/default.nix')
| -rw-r--r-- | pkgs/development/interpreters/perl/5.20/default.nix | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/pkgs/development/interpreters/perl/5.20/default.nix b/pkgs/development/interpreters/perl/5.20/default.nix index eacf8620f7b..01139121481 100644 --- a/pkgs/development/interpreters/perl/5.20/default.nix +++ b/pkgs/development/interpreters/perl/5.20/default.nix @@ -21,11 +21,11 @@ in with stdenv.lib; stdenv.mkDerivation rec { - name = "perl-5.20.2"; + name = "perl-5.20.3"; src = fetchurl { url = "mirror://cpan/authors/id/S/SH/SHAY/${name}.tar.gz"; - sha256 = "17cvplgpxbm1hshxlkra2fldn4da1iap1lsnb04hdm8ply93k95i"; + sha256 = "0jlvpd5l5nk7lzfd4akdg1sw6vinbkj6izclyyr0lrbidfky691m"; }; # TODO: Add a "dev" output containing the header files. @@ -36,11 +36,9 @@ stdenv.mkDerivation rec { patches = [ # Do not look in /usr etc. for dependencies. ./no-sys-dirs.patch - # Remove in 5.20.3 - ./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 ] ; + ++ stdenv.lib.optional stdenv.isDarwin [ ./cpp-precomp.patch ]; # There's an annoying bug on sandboxed Darwin in Perl's Cwd.pm where it looks for pwd # in /bin/pwd and /usr/bin/pwd and then falls back on just "pwd" if it can't get them @@ -87,6 +85,9 @@ stdenv.mkDerivation rec { ''} '' + optionalString stdenv.isDarwin '' substituteInPlace hints/darwin.sh --replace "env MACOSX_DEPLOYMENT_TARGET=10.3" "" + '' + optionalString (!enableThreading) '' + # We need to do this because the bootstrap doesn't have a static libpthread + sed -i 's,\(libswanted.*\)pthread,\1,g' Configure ''; preBuild = optionalString (!(stdenv ? cc && stdenv.cc.nativeTools)) |