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

Fix readfile-context.sh

Browse source
This commit is contained in:
Eelco Dolstra 2022-02-28 14:53:07 +01:00
parent bacf83e953
commit 00b0fb27c1
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/libexpr/primops.cc
View file

@ -1460,11 +1460,10 @@ static void prim_readFile(EvalState & state, const Pos & pos, Value * * args, Va
auto s = path.readFile(); auto s = path.readFile();
if (s.find((char) 0) != std::string::npos) if (s.find((char) 0) != std::string::npos)
throw Error("the contents of the file '%1%' cannot be represented as a Nix string", path); throw Error("the contents of the file '%1%' cannot be represented as a Nix string", path);
// FIXME: only do queryPathInfo if path.accessor is the store accessor
auto refs = auto refs =
#if 0 state.store->isInStore(path.path) ?
state.store->isInStore(path) ? state.store->queryPathInfo(state.store->toStorePath(path.path).first)->references :
state.store->queryPathInfo(state.store->toStorePath(path).first)->references :
#endif
StorePathSet{}; StorePathSet{};
auto context = state.store->printStorePathSet(refs); auto context = state.store->printStorePathSet(refs);
v.mkString(s, context); v.mkString(s, context);