foodogsquared/nixos-config
1
0
Fork 0
mirror of https://github.com/foo-dogsquared/nixos-config.git synced 2025-04-16 06:19:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

flake-parts/setups/nixos: fix image generation to consider specialArgs

Browse Source
This commit is contained in:
Gabriel Arazas 2025-03-14 18:20:06 +08:00
parent 2dc7a4a2ab
commit f677752cef
No known key found for this signature in database
GPG Key ID: 62104B43D00AA360
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
modules/flake-parts/setups/nixos.nix
View File

@ -37,11 +37,11 @@ let
in inputs.nixos-generators.nixosModules // customFormats; in inputs.nixos-generators.nixosModules // customFormats;
# A very very thin wrapper around `mkHost` to build with the given format. # A very very thin wrapper around `mkHost` to build with the given format.
mkImage = { pkgs, system, extraModules ? [ ], format ? "iso", }: mkImage = { pkgs, system, extraModules ? [ ], format ? "iso", specialArgs ? { } }:
let let
extraModules' = extraModules ++ [ nixosGeneratorsModulesSet.${format} ]; extraModules' = extraModules ++ [ nixosGeneratorsModulesSet.${format} ];
image = mkHost { image = mkHost {
inherit pkgs system; inherit pkgs system specialArgs;
extraModules = extraModules'; extraModules = extraModules';
}; };
in image.config.system.build.${image.config.formatAttr}; in image.config.system.build.${image.config.formatAttr};
@ -336,6 +336,7 @@ in {
buildImage = format: buildImage = format:
lib.nameValuePair "${name}-${format}" (mkImage { lib.nameValuePair "${name}-${format}" (mkImage {
inherit format system; inherit format system;
inherit (metadata) specialArgs;
pkgs = import inputs.${metadata.nixpkgs.branch} { pkgs = import inputs.${metadata.nixpkgs.branch} {
inherit system; inherit system;
inherit (metadata.nixpkgs) config; inherit (metadata.nixpkgs) config;