diff options
| author | volth <volth@volth.com> | 2018-12-15 03:50:31 +0000 |
|---|---|---|
| committer | volth <volth@volth.com> | 2018-12-15 03:50:31 +0000 |
| commit | bb9557eb7ca623ac9c12bae1fe4f95c9e290d27d (patch) | |
| tree | c4f1c253bf8cf5fe17612039d2a27acbdacef253 /nixos/lib | |
| parent | 921d046537f6d7f0fc0db07b7aa46be7e9df030b (diff) | |
| download | nixpkgs-bb9557eb7ca623ac9c12bae1fe4f95c9e290d27d.tar nixpkgs-bb9557eb7ca623ac9c12bae1fe4f95c9e290d27d.tar.gz nixpkgs-bb9557eb7ca623ac9c12bae1fe4f95c9e290d27d.tar.bz2 nixpkgs-bb9557eb7ca623ac9c12bae1fe4f95c9e290d27d.tar.lz nixpkgs-bb9557eb7ca623ac9c12bae1fe4f95c9e290d27d.tar.xz nixpkgs-bb9557eb7ca623ac9c12bae1fe4f95c9e290d27d.tar.zst nixpkgs-bb9557eb7ca623ac9c12bae1fe4f95c9e290d27d.zip | |
lib.makePerlPath -> perlPackages.makePerlPath
Diffstat (limited to 'nixos/lib')
| -rw-r--r-- | nixos/lib/testing.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nixos/lib/testing.nix b/nixos/lib/testing.nix index 0bb3fd53e85..05b06ca467e 100644 --- a/nixos/lib/testing.nix +++ b/nixos/lib/testing.nix @@ -34,14 +34,14 @@ in rec { cp ${./test-driver/test-driver.pl} $out/bin/nixos-test-driver chmod u+x $out/bin/nixos-test-driver - libDir=$out/lib/perl5/site_perl + libDir=$out/${perl.libPrefix} mkdir -p $libDir cp ${./test-driver/Machine.pm} $libDir/Machine.pm cp ${./test-driver/Logger.pm} $libDir/Logger.pm wrapProgram $out/bin/nixos-test-driver \ --prefix PATH : "${lib.makeBinPath [ qemu_test vde2 netpbm coreutils ]}" \ - --prefix PERL5LIB : "${with perlPackages; lib.makePerlPath [ TermReadLineGnu XMLWriter IOTty FileSlurp ]}:$out/lib/perl5/site_perl" + --prefix PERL5LIB : "${with perlPackages; makePerlPath [ TermReadLineGnu XMLWriter IOTty FileSlurp ]}:$out/${perl.libPrefix}" ''; }; |