aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2016-03-10 20:17:03 +0100
committerEelco Dolstra <eelco.dolstra@logicblox.com>2016-03-10 20:17:03 +0100
commit674c5ff64fd518ae7bc64a325b75f0a534e74905 (patch)
treec24e4af061ac9dbfc0edb34cd9d9a4425142df38 /src
parent1b18991082646c49403a6e48b2cd7f2d2d8c7c0f (diff)
parentf7f0116dd727ac954fb04d9ef9b9fe7ec034e563 (diff)
Merge pull request #834 from abbradar/master
Propagate path context via builtins.readFile
Diffstat (limited to 'src')
-rw-r--r--src/libexpr/primops.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libexpr/primops.cc b/src/libexpr/primops.cc
index 5bfb95be6..aaef467c0 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);
}