From 391d9ecc09e29078c09fe75c0f0493555bf47fac Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Tue, 26 Jun 2018 10:12:14 +0000
Subject: perlPackages -> perl{522,524,526,528}Packages

---
 pkgs/development/perl-modules/generic/default.nix | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'pkgs/development/perl-modules/generic')

diff --git a/pkgs/development/perl-modules/generic/default.nix b/pkgs/development/perl-modules/generic/default.nix
index 561bbcdb73ec..1d7e6d17ffb7 100644
--- a/pkgs/development/perl-modules/generic/default.nix
+++ b/pkgs/development/perl-modules/generic/default.nix
@@ -1,10 +1,10 @@
-perl:
+{ lib, stdenv, perl }:
 
 { nativeBuildInputs ? [], name, ... } @ attrs:
 
-perl.stdenv.mkDerivation (
+stdenv.mkDerivation (
   (
-  perl.stdenv.lib.recursiveUpdate
+  lib.recursiveUpdate
   {
     outputs = [ "out" "devdoc" ];
 
@@ -23,13 +23,17 @@ perl.stdenv.mkDerivation (
     # the results are not being monitored by a human being."
     AUTOMATED_TESTING = true;
 
+    # current directory (".") is removed from @INC in Perl 5.26 but many old libs rely on it
+    # https://metacpan.org/pod/release/XSAWYERX/perl-5.26.0/pod/perldelta.pod#Removal-of-the-current-directory-%28%22.%22%29-from-@INC
+    PERL_USE_UNSAFE_INC = lib.optionalString (lib.versionAtLeast (lib.getVersion perl) "5.26") "1";
+
     meta.homepage = "https://metacpan.org/release/${(builtins.parseDrvName name).name}";
   }
   attrs
   )
   //
   {
-    name = "perl-" + name;
+    name = "perl${lib.getVersion perl}-${name}";
     builder = ./builder.sh;
     nativeBuildInputs = nativeBuildInputs ++ [ (perl.dev or perl) ];
     inherit perl;
-- 
cgit 1.4.1