diff options
Diffstat (limited to 'src/libexpr/primops.cc')
| -rw-r--r-- | src/libexpr/primops.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/libexpr/primops.cc b/src/libexpr/primops.cc index 830a2c095..41b444b20 100644 --- a/src/libexpr/primops.cc +++ b/src/libexpr/primops.cc @@ -269,11 +269,11 @@ static Expr primDerivation(EvalState & state, const ATermVector & _args) printMsg(lvlChatty, format("instantiated `%1%' -> `%2%'") % drvName % drvPath); - attrs.set("outPath", makeAttrRHS(makePath(string2ATerm(outPath.c_str())), makeNoPos())); - attrs.set("drvPath", makeAttrRHS(makePath(string2ATerm(drvPath.c_str())), makeNoPos())); + attrs.set("outPath", makeAttrRHS(makePath(toATerm(outPath)), makeNoPos())); + attrs.set("drvPath", makeAttrRHS(makePath(toATerm(drvPath)), makeNoPos())); attrs.set("drvHash", - makeAttrRHS(makeStr(string2ATerm(((string) drvHash).c_str())), makeNoPos())); - attrs.set("type", makeAttrRHS(makeStr(string2ATerm("derivation")), makeNoPos())); + makeAttrRHS(makeStr(toATerm((string) drvHash)), makeNoPos())); + attrs.set("type", makeAttrRHS(makeStr(toATerm("derivation")), makeNoPos())); return makeAttrs(attrs); } @@ -283,7 +283,7 @@ static Expr primDerivation(EvalState & state, const ATermVector & _args) following the last slash. */ static Expr primBaseNameOf(EvalState & state, const ATermVector & args) { - return makeStr(string2ATerm(baseNameOf(evalString(state, args[0])).c_str())); + return makeStr(toATerm(baseNameOf(evalString(state, args[0])))); } |