diff options
author | Artturin <Artturin@artturin.com> | 2022-12-07 06:16:50 +0200 |
---|---|---|
committer | Artturin <Artturin@artturin.com> | 2022-12-08 21:05:28 +0200 |
commit | adc8900df1758eda56abd68f7d781d1df74fa531 (patch) | |
tree | 56f15a032fd0ba8df83195f6d9d6ee2870d4e838 /pkgs/development/perl-modules | |
parent | 734d7df2351ac1a10774e665447c5cdc286fc16e (diff) |
treewide: fix some core package structuredAttrs
Diffstat (limited to 'pkgs/development/perl-modules')
-rw-r--r-- | pkgs/development/perl-modules/generic/builder.sh | 3 | ||||
-rw-r--r-- | pkgs/development/perl-modules/generic/default.nix | 9 |
2 files changed, 9 insertions, 3 deletions
diff --git a/pkgs/development/perl-modules/generic/builder.sh b/pkgs/development/perl-modules/generic/builder.sh index 9b42401fc4dcd..e56d7ec10b219 100644 --- a/pkgs/development/perl-modules/generic/builder.sh +++ b/pkgs/development/perl-modules/generic/builder.sh @@ -1,3 +1,6 @@ +if [ -f .attrs.sh ]; then + . .attrs.sh +fi source $stdenv/setup PERL5LIB="$PERL5LIB${PERL5LIB:+:}$out/lib/perl5/site_perl" diff --git a/pkgs/development/perl-modules/generic/default.nix b/pkgs/development/perl-modules/generic/default.nix index 2d1c550d3168c..3dca6550ad688 100644 --- a/pkgs/development/perl-modules/generic/default.nix +++ b/pkgs/development/perl-modules/generic/default.nix @@ -24,6 +24,8 @@ # 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 ? "1" +, env ? {} + , ... }@attrs: @@ -43,10 +45,11 @@ lib.throwIf (attrs ? name) "buildPerlPackage: `name` (\"${attrs.name}\") is depr buildInputs = buildInputs ++ [ perl ]; nativeBuildInputs = nativeBuildInputs ++ [ (perl.mini or perl) ]; - fullperl = buildPerl; - inherit outputs src doCheck checkTarget enableParallelBuilding; - inherit PERL_AUTOINSTALL AUTOMATED_TESTING PERL_USE_UNSAFE_INC; + env = { + inherit PERL_AUTOINSTALL AUTOMATED_TESTING PERL_USE_UNSAFE_INC; + fullperl = buildPerl; + } // env; meta = defaultMeta // (attrs.meta or { }); }); |