Merge pull request 'devFlake: don't load if sources have been filtered out' (#4249) from fix-devflake-tryeval into main

Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/4249
2025-07-07 16:47:27 +00:00
parent 57fe4568ad 4c13dd38f3
commit c68b0677b9
1 changed files with 2 additions and 6 deletions
--- a/flake.nix
+++ b/flake.nix
@@ -59,13 +59,9 @@
        in
        builtins.getFlake (builtins.unsafeDiscardStringContext flakePath);

-      devFlake =
-        if pathExists ./devFlake/private && builtins ? getFlake then
-          loadDevFlake ./devFlake/private
-        else
-          null;
+      devFlake = builtins.tryEval (loadDevFlake ./devFlake/private);

-      privateInputs = if devFlake != null then devFlake.inputs else { };
+      privateInputs = if devFlake.success then devFlake.value.inputs else { };
    in
    flake-parts.lib.mkFlake { inherit inputs; } (
      { ... }: