public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Give more memory for the disk image builder

Browse Source 
http://hydra.nixos.org/build/26480662
This commit is contained in:
Eelco Dolstra 2015-10-06 15:03:26 +02:00
parent 0f90d10d0b
commit 106738b196
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nixos/lib/make-disk-image.nix
View File

@ -39,6 +39,7 @@ pkgs.vmTools.runInLinuxVM (
exportReferencesGraph = exportReferencesGraph =
[ "closure" config.system.build.toplevel ]; [ "closure" config.system.build.toplevel ];
inherit postVM; inherit postVM;
memSize = 1024;
} }
'' ''
${if partitioned then '' ${if partitioned then ''

8
pkgs/build-support/vm/default.nix
View File

@ -302,13 +302,13 @@ rec {
`run-vm' will be left behind in the temporary build directory `run-vm' will be left behind in the temporary build directory
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 ({ memSize ? 512, QEMU_OPTS ? "", args, builder, ... }: {
requiredSystemFeatures = [ "kvm" ]; requiredSystemFeatures = [ "kvm" ];
builder = "${bash}/bin/sh"; builder = "${bash}/bin/sh";
args = ["-e" (vmRunCommand qemuCommandLinux)]; args = ["-e" (vmRunCommand qemuCommandLinux)];
origArgs = attrs.args; origArgs = args;
origBuilder = attrs.builder; origBuilder = builder;
QEMU_OPTS = "${attrs.QEMU_OPTS or ""} -m ${toString (attrs.memSize or 512)}"; QEMU_OPTS = "${QEMU_OPTS} -m ${toString memSize}";
}); });