diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2019-12-11 14:53:30 +0100 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2019-12-11 14:53:30 +0100 |
| commit | ecb3a1afa2395c46c4ba2ec9da550f45414dbe6d (patch) | |
| tree | 6d1038ee909bd1ba69948a0bc326cd5ba6824e01 /src/nix/ls.cc | |
| parent | ab88f4bbd4117db458a79f0a02a4de7bf7931f4c (diff) | |
| parent | f800d450b78091835ab7ca67847d76e75d877a24 (diff) | |
Merge remote-tracking branch 'origin/master' into flakes
Diffstat (limited to 'src/nix/ls.cc')
| -rw-r--r-- | src/nix/ls.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/nix/ls.cc b/src/nix/ls.cc index 9408cc9da..3ef1f2750 100644 --- a/src/nix/ls.cc +++ b/src/nix/ls.cc @@ -67,7 +67,7 @@ struct MixLs : virtual Args, MixJSON if (st.type == FSAccessor::Type::tMissing) throw Error(format("path '%1%' does not exist") % path); doPath(st, path, - st.type == FSAccessor::Type::tDirectory ? "." : baseNameOf(path), + st.type == FSAccessor::Type::tDirectory ? "." : std::string(baseNameOf(path)), showDirectory); } |