Give more memory for the disk image builder

http://hydra.nixos.org/build/26480662

Changed files
+5 -4
nixos
pkgs
build-support
+1
nixos/lib/make-disk-image.nix
···
exportReferencesGraph =
[ "closure" config.system.build.toplevel ];
inherit postVM;
}
''
${if partitioned then ''
···
exportReferencesGraph =
[ "closure" config.system.build.toplevel ];
inherit postVM;
+
memSize = 1024;
}
''
${if partitioned then ''
+4 -4
pkgs/build-support/vm/default.nix
···
`run-vm' will be left behind in the temporary build directory
that allows you to boot into the VM and debug it interactively. */
-
runInLinuxVM = drv: lib.overrideDerivation drv (attrs: {
requiredSystemFeatures = [ "kvm" ];
builder = "${bash}/bin/sh";
args = ["-e" (vmRunCommand qemuCommandLinux)];
-
origArgs = attrs.args;
-
origBuilder = attrs.builder;
-
QEMU_OPTS = "${attrs.QEMU_OPTS or ""} -m ${toString (attrs.memSize or 512)}";
});
···
`run-vm' will be left behind in the temporary build directory
that allows you to boot into the VM and debug it interactively. */
+
runInLinuxVM = drv: lib.overrideDerivation drv ({ memSize ? 512, QEMU_OPTS ? "", args, builder, ... }: {
requiredSystemFeatures = [ "kvm" ];
builder = "${bash}/bin/sh";
args = ["-e" (vmRunCommand qemuCommandLinux)];
+
origArgs = args;
+
origBuilder = builder;
+
QEMU_OPTS = "${QEMU_OPTS} -m ${toString memSize}";
});