max/nix-super
1
0
Fork 0
mirror of https://github.com/privatevoid-net/nix-super.git synced 2024-11-24 14:56:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix resolveExprPath()

Browse source
This commit is contained in:
Eelco Dolstra 2022-05-09 14:28:47 +02:00
parent 53869fbd42
commit e89d3e0edf
3 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/libexpr/parser.y
View file

@ -699,11 +699,8 @@ SourcePath resolveExprPath(const SourcePath & path)
#endif #endif
// FIXME // FIXME
auto path2 = path.path + "/default.nix"; auto path2 = path.append("/default.nix");
if (path.pathExists()) return path2.pathExists() ? path2 : path;
return {path.accessor, path2};
return path;
} }

6
src/libfetchers/input-accessor.cc
View file

@ -227,6 +227,12 @@ std::ostream & operator << (std::ostream & str, const SourcePath & path)
return str; return str;
} }
SourcePath SourcePath::append(std::string_view s) const
{
// FIXME: canonicalize?
return {accessor, path + s};
}
struct MemoryInputAccessorImpl : MemoryInputAccessor struct MemoryInputAccessorImpl : MemoryInputAccessor
{ {
std::map<Path, std::string> files; std::map<Path, std::string> files;

2
src/libfetchers/input-accessor.hh
View file

@ -92,6 +92,8 @@ struct SourcePath
{ return accessor.dumpPath(path, sink, filter); } { return accessor.dumpPath(path, sink, filter); }
std::string to_string() const; std::string to_string() const;
SourcePath append(std::string_view s) const;
}; };
std::ostream & operator << (std::ostream & str, const SourcePath & path); std::ostream & operator << (std::ostream & str, const SourcePath & path);