diff options
author | Eelco Dolstra <edolstra@gmail.com> | 2022-02-02 12:38:37 +0100 |
---|---|---|
committer | Eelco Dolstra <edolstra@gmail.com> | 2022-02-02 12:38:37 +0100 |
commit | cd35bbbeef72375873e396b9ffed14a4638693a8 (patch) | |
tree | 3db28adee43b34ce0875d27f21bab247a34e4586 /src/resolve-system-dependencies | |
parent | 73d5f38a47e7c3dea62994cfb8f962976194f767 (diff) | |
parent | d439dceb3bc47f10a6f1f5b8cf4a5b17adc80071 (diff) |
Merge branch 'more-stringviews' of https://github.com/pennae/nix
Diffstat (limited to 'src/resolve-system-dependencies')
-rw-r--r-- | src/resolve-system-dependencies/resolve-system-dependencies.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/resolve-system-dependencies/resolve-system-dependencies.cc b/src/resolve-system-dependencies/resolve-system-dependencies.cc index 27cf53a45..98c969437 100644 --- a/src/resolve-system-dependencies/resolve-system-dependencies.cc +++ b/src/resolve-system-dependencies/resolve-system-dependencies.cc @@ -107,7 +107,7 @@ Path resolveSymlink(const Path & path) auto target = readLink(path); return hasPrefix(target, "/") ? target - : dirOf(path) + "/" + target; + : concatStrings(dirOf(path), "/", target); } std::set<string> resolveTree(const Path & path, PathSet & deps) |