aboutsummaryrefslogtreecommitdiff
path: root/src/libexpr
diff options
context:
space:
mode:
authorBen Burdette <bburdette@gmail.com>2020-05-11 15:52:15 -0600
committerBen Burdette <bburdette@gmail.com>2020-05-11 15:52:15 -0600
commitb93c1bf3d67716231d2ff7ee4154b8c80a251b10 (patch)
treecd45655102052480e02f2e7dbf274108e0c263c0 /src/libexpr
parent59b1f5c70150a81c7a6fa0dc3309a9d44e9621f8 (diff)
fixes to merged code
Diffstat (limited to 'src/libexpr')
-rw-r--r--src/libexpr/nixexpr.hh1
-rw-r--r--src/libexpr/primops.cc2
2 files changed, 2 insertions, 1 deletions
diff --git a/src/libexpr/nixexpr.hh b/src/libexpr/nixexpr.hh
index 137fe7198..a185d5785 100644
--- a/src/libexpr/nixexpr.hh
+++ b/src/libexpr/nixexpr.hh
@@ -2,6 +2,7 @@
#include "value.hh"
#include "symbol-table.hh"
+#include "error.hh"
#include <map>
diff --git a/src/libexpr/primops.cc b/src/libexpr/primops.cc
index 10e8c6b42..657ce3001 100644
--- a/src/libexpr/primops.cc
+++ b/src/libexpr/primops.cc
@@ -1124,7 +1124,7 @@ static void prim_toFile(EvalState & state, const Pos & pos, Value * * args, Valu
ErrorInfo {
.hint = hintfmt(
"in 'toFile': the file named '%1%' must not contain a reference "
- "to a derivation but contains (%2%)"
+ "to a derivation but contains (%2%)",
name,
path),
.nixCode = NixCode { .errPos = pos }