From 0d9ff479f88be5b1e9cecb4aa489b4debe58d1a6 Mon Sep 17 00:00:00 2001 From: Nessdoor Date: Sun, 27 Aug 2023 03:14:10 +0200 Subject: [PATCH] images/nixos: pass optional system attribute to evalConfig This allows for image.nix to be used inside hermetic builds where builtins.currentSystem is not available as an attribute. --- images/nixos/image.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/images/nixos/image.nix b/images/nixos/image.nix index 227039b..8e23f79 100644 --- a/images/nixos/image.nix +++ b/images/nixos/image.nix @@ -1,10 +1,16 @@ -{ pkgs ? import {} }: +{ pkgs ? import { } +, hostPlatform ? { system = builtins.currentSystem; } +}: let makeDiskImage = import "${pkgs.path}/nixos/lib/make-disk-image.nix"; evalConfig = import "${pkgs.path}/nixos/lib/eval-config.nix"; config = (evalConfig { - modules = [ (import ./qemu-system-configuration.nix) ]; + system = null; # Pass system parameters modularly + modules = [ + (import ./qemu-system-configuration.nix) + ({ ... }: { nixpkgs.hostPlatform = hostPlatform; }) + ]; }).config; in makeDiskImage { -- 2.38.5