From fb24c7c95b586678c2b65e6751a7797844c44e28 Mon Sep 17 00:00:00 2001 From: aszlig Date: Tue, 11 Aug 2015 03:14:09 +0200 Subject: [PATCH] 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 --- nixos/lib/testing.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/lib/testing.nix b/nixos/lib/testing.nix index 59d05f87d5f..d9b4ec89ce7 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" ''; };