diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2016-03-10T19·17+0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2016-03-10T19·17+0100 |
| commit | 674c5ff64fd518ae7bc64a325b75f0a534e74905 (patch) | |
| tree | c24e4af061ac9dbfc0edb34cd9d9a4425142df38 /src/libexpr/primops.cc | |
| parent | 1b18991082646c49403a6e48b2cd7f2d2d8c7c0f (diff) | |
| parent | f7f0116dd727ac954fb04d9ef9b9fe7ec034e563 (diff) | |
Merge pull request #834 from abbradar/master
Propagate path context via builtins.readFile
Diffstat (limited to 'src/libexpr/primops.cc')
| -rw-r--r-- | src/libexpr/primops.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libexpr/primops.cc b/src/libexpr/primops.cc index 5bfb95be6849..aaef467c098b 100644 --- a/src/libexpr/primops.cc +++ b/src/libexpr/primops.cc @@ -765,7 +765,7 @@ static void prim_readFile(EvalState & state, const Pos & pos, Value * * args, Va string s = readFile(state.checkSourcePath(path)); if (s.find((char) 0) != string::npos) 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); } |