From 18c5410fdfa506cab20e678c58a4fecfd1d47006 Mon Sep 17 00:00:00 2001 From: danjujan <44864658+danjujan@users.noreply.github.com> Date: Thu, 26 Sep 2024 12:28:15 +0200 Subject: [PATCH] make-disk-image: use memSize as default build-memory in diskoImagesScript --- lib/make-disk-image.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/make-disk-image.nix b/lib/make-disk-image.nix index d217af03..f81a473c 100644 --- a/lib/make-disk-image.nix +++ b/lib/make-disk-image.nix @@ -2,6 +2,7 @@ , diskoLib , lib , extendModules +, options , ... }: let @@ -130,7 +131,7 @@ in * --build-memory specify the amount of memory in MiB that gets allocated to the build VM This can be useful if you want to build images with a more involed NixOS config - The default is 1024 MiB + The default is disko.memSize which defaults to ${builtins.toString options.disko.memSize.default} MiB USAGE } @@ -200,7 +201,7 @@ in ''} export postVM=${diskoLib.writeCheckedBash { inherit pkgs checked; } "postVM.sh" postVM} - build_memory=''${build_memory:-1024} + build_memory=''${build_memory:-${builtins.toString diskoCfg.memSize}} QEMU_OPTS=${lib.escapeShellArg QEMU_OPTS} QEMU_OPTS+=" -m $build_memory" export QEMU_OPTS