diff --git a/starfive/visionfive/v1/sd-image-installer.nix b/starfive/visionfive/v1/sd-image-installer.nix index c08ba96..1b32132 100644 --- a/starfive/visionfive/v1/sd-image-installer.nix +++ b/starfive/visionfive/v1/sd-image-installer.nix @@ -1,12 +1,14 @@ # To build, use: # nix-build "" -I nixos-config=starfive/visionfive/v1/sd-image-installer.nix -A config.system.build.sdImage +{ modulesPath, ... }: + { imports = [ - + "${modulesPath}/profiles/installation-device.nix" ./sd-image.nix ]; - # the installation media is also the installation target, + # The installation media is also the installation target, # so we don't want to provide the installation configuration.nix. installer.cloneConfig = false; } diff --git a/starfive/visionfive/v1/sd-image.nix b/starfive/visionfive/v1/sd-image.nix index 7a8aa81..6b4acfc 100644 --- a/starfive/visionfive/v1/sd-image.nix +++ b/starfive/visionfive/v1/sd-image.nix @@ -1,13 +1,13 @@ # To build, use: -# nix-build "" -I nixos-config=starfive/visionfive/v1/sd-image.nix -A config.system.build.sdImage -{ config, pkgs, ... }: +# nix-build "" -I nixos-config=starfive/visionfive/v1/sd-image.nix -A config.system.build.sdImage +{ config, pkgs, modulesPath, ... }: let firmware = pkgs.callPackage ./firmware.nix { }; in { imports = [ - - + "${modulesPath}/profiles/base.nix" + "${modulesPath}/installer/sd-card/sd-image.nix" ./default.nix ];