* Mark the VM builds as requiring KVM support.
svn path=/nixpkgs/trunk/; revision=23526
This commit is contained in:
parent
6473176133
commit
3cdc3c4abe
|
@ -334,6 +334,7 @@ rec {
|
||||||
that allows you to boot into the VM and debug it interactively. */
|
that allows you to boot into the VM and debug it interactively. */
|
||||||
|
|
||||||
runInLinuxVM = drv: lib.overrideDerivation drv (attrs: {
|
runInLinuxVM = drv: lib.overrideDerivation drv (attrs: {
|
||||||
|
requiredSystemFeatures = [ "kvm" ];
|
||||||
builder = "${bash}/bin/sh";
|
builder = "${bash}/bin/sh";
|
||||||
args = ["-e" (vmRunCommand qemuCommandLinux)];
|
args = ["-e" (vmRunCommand qemuCommandLinux)];
|
||||||
origArgs = attrs.args;
|
origArgs = attrs.args;
|
||||||
|
@ -369,6 +370,7 @@ rec {
|
||||||
*/
|
*/
|
||||||
runInGenericVM = drv: lib.overrideDerivation drv (attrs: {
|
runInGenericVM = drv: lib.overrideDerivation drv (attrs: {
|
||||||
system = "i686-linux";
|
system = "i686-linux";
|
||||||
|
requiredSystemFeatures = [ "kvm" ];
|
||||||
builder = "${bash}/bin/sh";
|
builder = "${bash}/bin/sh";
|
||||||
args = ["-e" (vmRunCommand qemuCommandGeneric)];
|
args = ["-e" (vmRunCommand qemuCommandGeneric)];
|
||||||
QEMU_OPTS = "-m ${toString (if attrs ? memSize then attrs.memSize else 256)}";
|
QEMU_OPTS = "-m ${toString (if attrs ? memSize then attrs.memSize else 256)}";
|
||||||
|
|
Loading…
Reference in a new issue