lunaphied/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

Merge pull request #834 from abbradar/master

Browse source 
Propagate path context via builtins.readFile
This commit is contained in:
Eelco Dolstra 2016-03-10 20:17:03 +01:00
parent 1b18991082 f7f0116dd7
commit 674c5ff64f
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/libexpr/primops.cc
View file

@ -765,7 +765,7 @@ static void prim_readFile(EvalState & state, const Pos & pos, Value * * args, Va
string s = readFile(state.checkSourcePath(path)); string s = readFile(state.checkSourcePath(path));
if (s.find((char) 0) != string::npos) if (s.find((char) 0) != string::npos)
throw Error(format("the contents of the file ‘%1%’ cannot be represented as a Nix string") % path); throw Error(format("the contents of the file ‘%1%’ cannot be represented as a Nix string") % path);
mkString(v, s.c_str()); mkString(v, s.c_str(), context);
} }