Merge branch 'dirOf-relative' of https://github.com/lheckemann/nix

2018-09-13 14:33:12 +02:00
parent 0aca1ffb6e d7402c9cd5
commit 8327a7a8fa
2 changed files with 2 additions and 2 deletions
@@ -866,7 +866,7 @@ static void prim_baseNameOf(EvalState & state, const Pos & pos, Value * * args,
 static void prim_dirOf(EvalState & state, const Pos & pos, Value * * args, Value & v)
 {
    PathSet context;
-    Path dir = dirOf(state.coerceToPath(pos, *args[0], context));
+    Path dir = dirOf(state.coerceToString(pos, *args[0], context, false, false));
    if (args[0]->type == tPath) mkPath(v, dir.c_str()); else mkString(v, dir, context);
 }