about summary refs log tree commit diff
path: root/nixos/lib
diff options
context:
space:
mode:
authorEelco Dolstra <edolstra@gmail.com>2016-12-15 13:49:15 +0100
committerEelco Dolstra <edolstra@gmail.com>2016-12-20 10:52:46 +0100
commitaad5d1f9a7b933442c646f1f1d69b5d9df0ffbcf (patch)
treef0c7eba8df6bfb40b7666c0dbb6272c6a031ddd9 /nixos/lib
parent8a0843c3c4929d38b9a79f61449fc63c6a27e4a0 (diff)
downloadnixlib-aad5d1f9a7b933442c646f1f1d69b5d9df0ffbcf.tar
nixlib-aad5d1f9a7b933442c646f1f1d69b5d9df0ffbcf.tar.gz
nixlib-aad5d1f9a7b933442c646f1f1d69b5d9df0ffbcf.tar.bz2
nixlib-aad5d1f9a7b933442c646f1f1d69b5d9df0ffbcf.tar.lz
nixlib-aad5d1f9a7b933442c646f1f1d69b5d9df0ffbcf.tar.xz
nixlib-aad5d1f9a7b933442c646f1f1d69b5d9df0ffbcf.tar.zst
nixlib-aad5d1f9a7b933442c646f1f1d69b5d9df0ffbcf.zip
virtualisation.qemu.program: Remove
This option is defined in qemu-vm.nix, but that module is not always
imported.

http://hydra.nixos.org/build/44817443
(cherry picked from commit 03c55005dfd6fbcd5cf8e00128a3bb6336b3bc0f)
Diffstat (limited to 'nixos/lib')
-rw-r--r--nixos/lib/testing.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/lib/testing.nix b/nixos/lib/testing.nix
index 2efe7a5b879c..0fc3978315cc 100644
--- a/nixos/lib/testing.nix
+++ b/nixos/lib/testing.nix
@@ -29,7 +29,7 @@ rec {
         cp ${./test-driver/Logger.pm} $libDir/Logger.pm
 
         wrapProgram $out/bin/nixos-test-driver \
-          --prefix PATH : "${lib.makeBinPath [ qemu_kvm vde2 netpbm coreutils ]}" \
+          --prefix PATH : "${lib.makeBinPath [ qemu_test vde2 netpbm coreutils ]}" \
           --prefix PERL5LIB : "${with perlPackages; lib.makePerlPath [ TermReadLineGnu XMLWriter IOTty FileSlurp ]}:$out/lib/perl5/site_perl"
       '';
   };