Merge remote-tracking branch 'upstream/master' into ca-drv

1 files changed, 2 insertions, 2 deletions

diff --git a/src/nix-instantiate/nix-instantiate.cc b/src/nix-instantiate/nix-instantiate.cc
index 6c99d1181..bf353677a 100644
--- a/src/nix-instantiate/nix-instantiate.cc
+++ b/src/nix-instantiate/nix-instantiate.cc
@@ -66,7 +66,7 @@ void processExpr(EvalState & state, const Strings & attrPaths,
                 /* What output do we want? */
                 string outputName = i.queryOutputName();
                 if (outputName == "")
-                    throw Error(format("derivation '%1%' lacks an 'outputName' attribute ") % drvPath);
+                    throw Error("derivation '%1%' lacks an 'outputName' attribute ", drvPath);
 
                 if (gcRoot == "")
                     printGCWarning();
@@ -166,7 +166,7 @@ static int _main(int argc, char * * argv)
         if (findFile) {
             for (auto & i : files) {
                 Path p = state->findFile(i);
-                if (p == "") throw Error(format("unable to find '%1%'") % i);
+                if (p == "") throw Error("unable to find '%1%'", i);
                 std::cout << p << std::endl;
             }
             return 0;