diff options
Diffstat (limited to 'pkgs/development')
-rw-r--r-- | pkgs/development/interpreters/perl/default.nix | 5 | ||||
-rw-r--r-- | pkgs/development/perl-modules/generic/builder.sh | 2 | ||||
-rw-r--r-- | pkgs/development/perl-modules/generic/default.nix | 4 |
3 files changed, 7 insertions, 4 deletions
diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix index c95d9b3009a..d475e88bf9d 100644 --- a/pkgs/development/interpreters/perl/default.nix +++ b/pkgs/development/interpreters/perl/default.nix @@ -23,7 +23,7 @@ let libcLib = lib.getLib libc; crossCompiling = stdenv.buildPlatform != stdenv.hostPlatform; - common = { self, version, sha256 }: stdenv.mkDerivation (rec { + common = { self, buildPerl, version, sha256 }: stdenv.mkDerivation (rec { inherit version; name = "perl-${version}"; @@ -110,6 +110,7 @@ let libPrefix = "lib/perl5/site_perl"; pkgs = callPackage ../../../top-level/perl-packages.nix { perl = self; + inherit buildPerl; overrides = config.perlPackageOverrides or (p: {}); # TODO: (self: super: {}) like in python }; buildEnv = callPackage ./wrapper.nix { @@ -194,6 +195,7 @@ in rec { # the latest Maint version perl528 = common { self = perl528; + buildPerl = buildPackages.perl528; version = "5.28.2"; sha256 = "1iynpsxdym4h76kgndmn3ykvwxhqz444xvaz8z2irsxkvmnlb5da"; }; @@ -201,6 +203,7 @@ in rec { # the latest Devel version perldevel = common { self = perldevel; + buildPerl = buildPackages.perldevel; version = "5.29.9"; sha256 = "017x3nghyc5m8q1yqnrdma96b3d5rlfx87vv5mi64jq0r8k6zppm"; }; diff --git a/pkgs/development/perl-modules/generic/builder.sh b/pkgs/development/perl-modules/generic/builder.sh index b833ceb3cab..e05cd07708d 100644 --- a/pkgs/development/perl-modules/generic/builder.sh +++ b/pkgs/development/perl-modules/generic/builder.sh @@ -22,7 +22,7 @@ preConfigure() { fi done - perl Makefile.PL PREFIX=$out INSTALLDIRS=site $makeMakerFlags PERL=$(type -P perl) FULLPERL=\"$perl/bin/perl\" + perl Makefile.PL PREFIX=$out INSTALLDIRS=site $makeMakerFlags PERL=$(type -P perl) FULLPERL=\"$fullperl/bin/perl\" } diff --git a/pkgs/development/perl-modules/generic/default.nix b/pkgs/development/perl-modules/generic/default.nix index 20947b1dc33..d32755db990 100644 --- a/pkgs/development/perl-modules/generic/default.nix +++ b/pkgs/development/perl-modules/generic/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, perl, buildPackages, toPerlModule }: +{ lib, stdenv, perl, buildPerl, toPerlModule }: { nativeBuildInputs ? [], name, ... } @ attrs: @@ -37,6 +37,6 @@ toPerlModule(stdenv.mkDerivation ( name = "perl${perl.version}-${name}"; builder = ./builder.sh; nativeBuildInputs = nativeBuildInputs ++ [ (perl.dev or perl) ]; - perl = buildPackages.perl; + fullperl = buildPerl; } )) |