1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-29 06:21:14 +02:00

Fix clang build

This commit is contained in:
Eelco Dolstra 2023-02-17 15:20:06 +01:00
parent 12f141391c
commit 02d5c54555
4 changed files with 4 additions and 4 deletions

View file

@ -21,7 +21,7 @@ std::string EvalState::encodePath(const SourcePath & path)
to /nix/store/virtual000...<N>) and we should deprecate it to /nix/store/virtual000...<N>) and we should deprecate it
eventually. So print a warning about use of an encoded path in eventually. So print a warning about use of an encoded path in
decodePath(). */ decodePath(). */
return path.accessor == rootFS return path.accessor == ref<InputAccessor>(rootFS)
? path.path.abs() ? path.path.abs()
: fmt("%s%08x-source%s", virtualPathMarker, path.accessor->number, path.path.absOrEmpty()); : fmt("%s%08x-source%s", virtualPathMarker, path.accessor->number, path.path.absOrEmpty());
} }

View file

@ -8,7 +8,7 @@
#include <memory> #include <memory>
namespace nix { class Store; class StorePath; class InputAccessor; } namespace nix { class Store; class StorePath; struct InputAccessor; }
namespace nix::fetchers { namespace nix::fetchers {

View file

@ -113,7 +113,7 @@ struct MercurialInputScheme : InputScheme
const Input & input, const Input & input,
const CanonPath & path, const CanonPath & path,
std::string_view contents, std::string_view contents,
std::optional<std::string> commitMsg) const std::optional<std::string> commitMsg) const override
{ {
auto [isLocal, repoPath] = getActualUrl(input); auto [isLocal, repoPath] = getActualUrl(input);
if (!isLocal) if (!isLocal)

View file

@ -96,7 +96,7 @@ struct PathInputScheme : InputScheme
const Input & input, const Input & input,
const CanonPath & path, const CanonPath & path,
std::string_view contents, std::string_view contents,
std::optional<std::string> commitMsg) const std::optional<std::string> commitMsg) const override
{ {
auto absPath = CanonPath(getAbsPath(input)) + path; auto absPath = CanonPath(getAbsPath(input)) + path;