diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix index b9416bcc41f0..f43578cdc335 100644 --- a/pkgs/development/interpreters/perl/default.nix +++ b/pkgs/development/interpreters/perl/default.nix @@ -9,13 +9,19 @@ stdenv.mkDerivation { sha256 = "1j8vzc6lva49mwdxkzhvm78dkxyprqs4n4057amqvsh4kh6i92l1"; }; - # This patch does the following: - # 1) Do use the PATH environment variable to find the `pwd' command. - # By default, Perl will only look for it in /lib and /usr/lib. - # !!! what are the security implications of this? - # 2) Force the use of , not /usr/include/errno.h, on Linux - # systems. (This actually appears to be due to a bug in Perl.) - patches = [./no-sys-dirs.patch]; + patches = [ + # This patch does the following: + # 1) Do use the PATH environment variable to find the `pwd' command. + # By default, Perl will only look for it in /lib and /usr/lib. + # !!! what are the security implications of this? + # 2) Force the use of , not /usr/include/errno.h, on Linux + # systems. (This actually appears to be due to a bug in Perl.) + ./no-sys-dirs.patch + + # Patch to make Perl 5.8.8 build with GCC 4.2. Taken from + # http://www.nntp.perl.org/group/perl.perl5.porters/2006/11/msg117738.html + ./gcc-4.2.patch + ]; setupHook = ./setup-hook.sh; } diff --git a/pkgs/development/interpreters/perl/gcc-4.2.patch b/pkgs/development/interpreters/perl/gcc-4.2.patch new file mode 100644 index 000000000000..679a7abde3b6 --- /dev/null +++ b/pkgs/development/interpreters/perl/gcc-4.2.patch @@ -0,0 +1,10 @@ +--- perl-5.8.x/makedepend.SH 2006-06-13 15:31:22.000000000 -0400 ++++ perl-5.8.x-andy/makedepend.SH 2006-07-25 14:45:11.000000000 -0400 +@@ -167,6 +167,7 @@ + -e '/^#.*/d' \ + -e '/^#.*/d' \ + -e '/^#.*/d' \ ++ -e '/^#.*/d' \ + -e '/^#.*"-"/d' \ + -e '/: file path prefix .* never used$/d' \ + -e 's#\.[0-9][0-9]*\.c#'"$file.c#" \