fix: add missing prefix for submodules, incorrect var name
This commit is contained in:
parent
dc2ce818b8
commit
9316874396
|
@ -820,6 +820,7 @@ lib: {
|
|||
check = value: builtins.isAttrs value || builtins.isFunction value || lib.types.path.check value;
|
||||
merge = location: definitions: let
|
||||
result = base.extend {
|
||||
prefix = location;
|
||||
modules =
|
||||
[{config.__module__.args.dynamic.name = lib.lists.last location;}]
|
||||
++ getModules definitions;
|
||||
|
|
|
@ -2103,7 +2103,7 @@ in {
|
|||
then "x86" # not i386
|
||||
else if resolved.isMips64
|
||||
then "mips64" # uboot *does* distinguish between mips32/mips64
|
||||
else resolved.linuxArch; # other cases appear to agree with linuxArch
|
||||
else resolved.linux.arch # other cases appear to agree with linuxArch
|
||||
|
||||
qemu.arch =
|
||||
if resolved.isAarch32
|
||||
|
|
Loading…
Reference in a new issue