fixes to merged code

2020-05-11 15:52:15 -06:00
parent 59b1f5c701
commit b93c1bf3d6
13 changed files with 29 additions and 33 deletions
@@ -2,6 +2,7 @@

 #include "value.hh"
 #include "symbol-table.hh"
+#include "error.hh"

 #include <map>

@@ -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 }