From a9b0e88315011fa0c84bb3847bc1c4e1b9f286a5 Mon Sep 17 00:00:00 2001
From: Kiara Grouwstra <kiara@procolix.eu>
Date: Sun, 11 May 2025 13:59:47 +0200
Subject: [PATCH] iso defaults

---
 infra/makeInstallerIso.nix | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/infra/makeInstallerIso.nix b/infra/makeInstallerIso.nix
index d222c113..501acad1 100644
--- a/infra/makeInstallerIso.nix
+++ b/infra/makeInstallerIso.nix
@@ -5,9 +5,14 @@
 */
 
 {
-  nixpkgs,
+  nixpkgs ? <nixpkgs>,
   hostKeys ? { },
+  system ? builtins.currentSystem, # may need build on remote
   nixosConfiguration ? import ../infra/common/nixos/base.nix,
+  conf ? import "${nixpkgs}/nixos/lib/eval-config.nix" {
+    system = builtins.currentSystem;
+    modules = [ nixosConfiguration ];
+  },
 }:
 
 let
@@ -25,8 +30,8 @@ let
         name = "bootstrap";
         runtimeInputs = with pkgs; [ nixos-install-tools ];
         text = ''
-          ${nixosConfiguration.config.system.build.diskoScript}
-          nixos-install --no-root-password --no-channel-copy --system ${nixosConfiguration.config.system.build.toplevel}
+          ${conf.config.system.build.diskoScript}
+          nixos-install --no-root-password --no-channel-copy --system ${conf.config.system.build.toplevel}
           ${concatStringsSep "\n" (
             attrValues (
               mapAttrs (kind: keys: ''
@@ -42,10 +47,12 @@ let
       };
     in
     {
-      imports = [ "${nixpkgs}/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix" ];
-      nixpkgs.hostPlatform = "x86_64-linux";
+      imports = [
+        "${nixpkgs}/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix"
+      ];
+      nixpkgs.hostPlatform = system;
       services.getty.autologinUser = lib.mkForce "root";
-      programs.bash.loginShellInit = nixpkgs.lib.getExe bootstrap;
+      programs.bash.loginShellInit = pkgs.lib.getExe bootstrap;
 
       isoImage = {
         compressImage = false;
@@ -56,4 +63,7 @@ let
       };
     };
 in
-(nixpkgs.lib.nixosSystem { modules = [ installer ]; }).config.system.build.isoImage
+(import "${nixpkgs}/nixos/lib/eval-config.nix" {
+  inherit system;
+  modules = [ installer ];
+}).config.system.build.isoImage