From 8ce5ee5c5ac14d0f330a218e15f436e81e52730a Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Wed, 6 Dec 2017 22:20:56 +0000 Subject: perl: fix parallel building https://hydra.nixos.org/build/65428077/nixlog/1 --- pkgs/development/interpreters/perl/default.nix | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'pkgs/development/interpreters') diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix index d2fff13e2ee4..f3b1cb31d6c7 100644 --- a/pkgs/development/interpreters/perl/default.nix +++ b/pkgs/development/interpreters/perl/default.nix @@ -34,6 +34,11 @@ let patches = [ # Do not look in /usr etc. for dependencies. ./no-sys-dirs.patch + # 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 -- cgit 1.4.1 From dc4200f93462c6654386a47975a4585671bbb8c4 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Thu, 7 Dec 2017 07:07:58 +0000 Subject: perl522: do not apply the patch for parallel building It does not apply and this version is not affected. --- pkgs/development/interpreters/perl/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'pkgs/development/interpreters') diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix index f3b1cb31d6c7..7b0ecee1922d 100644 --- a/pkgs/development/interpreters/perl/default.nix +++ b/pkgs/development/interpreters/perl/default.nix @@ -34,12 +34,13 @@ let patches = [ # 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 { + 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; -- cgit 1.4.1