diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2018-09-13T12·33+0200 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2018-09-13T12·33+0200 |
| commit | 8327a7a8fa0ce6f6b1d1e0ea1324d053a031e438 (patch) | |
| tree | 63790900172caf96ee222b7174cf550626f00c25 /src/libexpr | |
| parent | 0aca1ffb6ef655a5147e27e4307074f0b303000f (diff) | |
| parent | d7402c9cd5c17644d73b2a7a39e10be22fffeb00 (diff) | |
Merge branch 'dirOf-relative' of https://github.com/lheckemann/nix
Diffstat (limited to 'src/libexpr')
| -rw-r--r-- | src/libexpr/primops.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libexpr/primops.cc b/src/libexpr/primops.cc index 6f82c6c404f2..7372134e2c9b 100644 --- a/src/libexpr/primops.cc +++ b/src/libexpr/primops.cc @@ -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); } |