fix: flakes support on disko standalone cli
This commit is contained in:
committed by
Jörg Thalheim
parent
83c4da299c
commit
da6109c917
@@ -17,11 +17,14 @@ let
|
||||
|
||||
hasDiskoFile = diskoFile != null;
|
||||
|
||||
hasDiskoConfigFlake =
|
||||
hasDiskoFile || lib.hasAttrByPath [ "diskoConfigurations" flakeAttr ] (builtins.getFlake flake);
|
||||
|
||||
diskoAttr =
|
||||
(
|
||||
if noDeps then
|
||||
(
|
||||
if hasDiskoFile then
|
||||
if hasDiskoFile || hasDiskoConfigFlake then
|
||||
{
|
||||
destroy = "_cliDestroyNoDeps";
|
||||
format = "_cliFormatNoDeps";
|
||||
@@ -50,7 +53,7 @@ let
|
||||
}
|
||||
else
|
||||
(
|
||||
if hasDiskoFile then
|
||||
if hasDiskoFile || hasDiskoConfigFlake then
|
||||
{
|
||||
destroy = "_cliDestroy";
|
||||
format = "_cliFormat";
|
||||
@@ -79,9 +82,6 @@ let
|
||||
}
|
||||
).${mode};
|
||||
|
||||
hasDiskoConfigFlake =
|
||||
hasDiskoFile || lib.hasAttrByPath [ "diskoConfigurations" flakeAttr ] (builtins.getFlake flake);
|
||||
|
||||
hasDiskoModuleFlake = lib.hasAttrByPath [
|
||||
"nixosConfigurations"
|
||||
flakeAttr
|
||||
|
||||
Reference in New Issue
Block a user