Skip to content

Commit

Permalink
don't use .devenv.flake.nix in call-flake
Browse files Browse the repository at this point in the history
  • Loading branch information
domenkozar committed Apr 25, 2024
1 parent b24a931 commit 7c2a738
Showing 1 changed file with 1 addition and 5 deletions.
6 changes: 1 addition & 5 deletions src/libexpr/flake/call-flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -70,11 +70,7 @@ let

outPath = sourceInfo + ((if subdir == "" then "" else "/") + subdir);

file = if builtins.pathExists (outPath + "/.devenv.flake.nix")
then "/.devenv.flake.nix"
else "/flake.nix";

flake = import (outPath + file);
flake = import (outPath + "/flake.nix");

inputs = builtins.mapAttrs
(inputName: inputSpec: allNodes.${resolveInput inputSpec})
Expand Down

1 comment on commit 7c2a738

@therealpxc
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm quite surprised that this is the fix. Is this working around a bug in builtins.pathExists?

Please sign in to comment.