diff options
| author | aszlig <aszlig@redmoonstudios.org> | 2015-08-11 03:14:09 +0200 |
|---|---|---|
| committer | aszlig <aszlig@redmoonstudios.org> | 2015-08-11 03:14:09 +0200 |
| commit | fb24c7c95b586678c2b65e6751a7797844c44e28 (patch) | |
| tree | 13ab8ca6267aaed66358613bb2301f2f12967c5b /nixos/lib/testing.nix | |
| parent | 4abc4fa991eadd8a2058bd46b057ac397de28881 (diff) | |
| download | nixlib-fb24c7c95b586678c2b65e6751a7797844c44e28.tar nixlib-fb24c7c95b586678c2b65e6751a7797844c44e28.tar.gz nixlib-fb24c7c95b586678c2b65e6751a7797844c44e28.tar.bz2 nixlib-fb24c7c95b586678c2b65e6751a7797844c44e28.tar.lz nixlib-fb24c7c95b586678c2b65e6751a7797844c44e28.tar.xz nixlib-fb24c7c95b586678c2b65e6751a7797844c44e28.tar.zst nixlib-fb24c7c95b586678c2b65e6751a7797844c44e28.zip | |
nixos/testing: Don't shadow "lib" in makePerlPath.
Regression introduced by 032f0ffdd03fa4d836825bcbb7e89f1abcf7e57f. The change doesn't look obvious at the first sight why it may cause problems with lib.makePerlPath, but it introduces a Perl package called "lib". And using "with perlPackages;" uses the Perl library "lib" instead of the lib attribute set from pkgs. So let's use pkgs.lib.makePerlPath directly in hope that there won't be a Perl package anytime soon which is called "pkgs". Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Diffstat (limited to 'nixos/lib/testing.nix')
| -rw-r--r-- | nixos/lib/testing.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/lib/testing.nix b/nixos/lib/testing.nix index 59d05f87d5fe..d9b4ec89ce78 100644 --- a/nixos/lib/testing.nix +++ b/nixos/lib/testing.nix @@ -28,7 +28,7 @@ rec { wrapProgram $out/bin/nixos-test-driver \ --prefix PATH : "${qemu_kvm}/bin:${vde2}/bin:${netpbm}/bin:${coreutils}/bin" \ - --prefix PERL5LIB : "${with perlPackages; lib.makePerlPath [ TermReadLineGnu XMLWriter IOTty FileSlurp ]}:$out/lib/perl5/site_perl" + --prefix PERL5LIB : "${with perlPackages; pkgs.lib.makePerlPath [ TermReadLineGnu XMLWriter IOTty FileSlurp ]}:$out/lib/perl5/site_perl" ''; }; |