From 979f163615745db74f3a94a71818e66c75baf9ac Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 31 Mar 2010 19:52:29 +0000 Subject: * Handle string contexts. `nix-instantiate' can now correctly compute the `firefoxWrapper' attribute in Nixpkgs, and it's about 3 times faster than the trunk :-) --- src/libexpr/primops.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/libexpr/primops.cc') diff --git a/src/libexpr/primops.cc b/src/libexpr/primops.cc index 31914a65dd..e16cd2419c 100644 --- a/src/libexpr/primops.cc +++ b/src/libexpr/primops.cc @@ -588,7 +588,7 @@ static void prim_toFile(EvalState & state, Value * * args, Value & v) { PathSet context; string name = state.forceStringNoCtx(*args[0]); - string contents = state.forceString(*args[1]); // !!! context + string contents = state.forceString(*args[1], context); PathSet refs; @@ -928,7 +928,7 @@ static void prim_toString(EvalState & state, Value * * args, Value & v) { PathSet context; string s = state.coerceToString(*args[0], context, true, false); - mkString(v, s.c_str()); // !!! context + mkString(v, s, context); } -- cgit 1.4.1