fix: work on making the installer work offline

fix: ensure system closure is installed for derivations needed by the installer

fix: build closure in build-step instead of on iso
This commit is contained in:
UGA Innovation Factory
2026-01-05 11:58:38 -05:00
parent c6f4a39eee
commit f68c63590b
2 changed files with 17 additions and 5 deletions

View File

@@ -20,6 +20,12 @@ let
targetConfig = self.nixosConfigurations.${hostName}.config; targetConfig = self.nixosConfigurations.${hostName}.config;
targetSystem = targetConfig.system.build.toplevel; targetSystem = targetConfig.system.build.toplevel;
diskoScript = targetConfig.system.build.diskoScript; diskoScript = targetConfig.system.build.diskoScript;
# Build the closure export at build time (not runtime in ISO)
closureExport = pkgs.runCommand "closure-export-${hostName}" { } ''
mkdir -p $out
${pkgs.nix}/bin/nix-store --export $(${pkgs.nix}/bin/nix-store -qR ${targetSystem}) > $out/closure.nar
'';
in in
nixpkgs.lib.nixosSystem { nixpkgs.lib.nixosSystem {
inherit system; inherit system;
@@ -29,6 +35,7 @@ let
hostName hostName
targetSystem targetSystem
diskoScript diskoScript
closureExport
; ;
hostPlatform = system; hostPlatform = system;
}; };

View File

@@ -1,6 +1,7 @@
# This module defines a systemd service that automatically installs NixOS to the disk. # This module defines a systemd service that automatically installs NixOS to the disk.
# It is intended to be used in an installation ISO. # It is intended to be used in an installation ISO.
# It expects `targetSystem` (the closure to install) and `diskoScript` (the partitioning script) to be passed as arguments. # It expects `targetSystem` (the closure to install), `diskoScript` (the partitioning script),
# and `closureExport` (the pre-built NAR archive) to be passed as arguments.
{ {
config, config,
lib, lib,
@@ -10,6 +11,7 @@
hostPlatform, hostPlatform,
targetSystem, targetSystem,
diskoScript, diskoScript,
closureExport,
... ...
}: }:
{ {
@@ -53,14 +55,17 @@
echo ">>> Running disko script..." echo ">>> Running disko script..."
${diskoScript} ${diskoScript}
echo ">>> Importing pre-built closure into target store..."
# Import the closure that was exported at build time
${pkgs.nix}/bin/nix-store --store /mnt --import < /closure-export/closure.nar > /dev/null
echo ">>> Running nixos-install..." echo ">>> Running nixos-install..."
# Use only local store - don't fetch from binary cache or build # Install with pre-built closure already imported (no evaluation or fetching needed)
nixos-install \ ${pkgs.nix}/bin/nixos-install \
--no-root-passwd \ --no-root-passwd \
--root /mnt \ --root /mnt \
--system ${targetSystem} \ --system ${targetSystem} \
--option substitute false \ --option substitute false
--option build-use-sandbox false
echo ">>> Done. Rebooting." echo ">>> Done. Rebooting."
systemctl reboot systemctl reboot