File tree Expand file tree Collapse file tree 1 file changed +7
-4
lines changed Expand file tree Collapse file tree 1 file changed +7
-4
lines changed Original file line number Diff line number Diff line change 50
50
name = builtins . head paths ;
51
51
input = inputs . ${ name } or ( throw "Unknown input ${ name } " ) ;
52
52
subpath = "/${ lib . concatStringsSep "/" ( builtins . tail paths ) } " ;
53
- devenvpath = "${ input } " + subpath + "/devenv.nix" ;
53
+ devenvpath = "${ input } " + subpath ;
54
+ devenvdefaultpath = filepath + "/devenv.nix" ;
54
55
in
55
- if builtins . pathExists devenvpath
56
- then devenvpath
57
- else throw ( devenvpath + " file does not exist for input ${ name } ." ) ;
56
+ if lib . hasSuffix ".nix" devenvpath
57
+ then filepath
58
+ else if builtins . pathExists devenvdefaultpath
59
+ then devenvdefaultpath
60
+ else throw ( devenvdefaultpath + " file does not exist for input ${ name } ." ) ;
58
61
project = pkgs . lib . evalModules {
59
62
specialArgs = inputs // { inherit inputs pkgs ; } ;
60
63
modules = [
You can’t perform that action at this time.
0 commit comments