nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-30 14:10:59 +01:00
Code Activity

Improve symlink handling

Browse source
This commit is contained in:
Eelco Dolstra 2022-05-17 13:56:26 +02:00
parent 2a53574675
commit df2aa29690
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
7 changed files with 51 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/nix-env/nix-env.cc
View file

@ -119,7 +119,7 @@ static void getAllExprs(EvalState & state,
InputAccessor::Stat st;
try {
st = path2.accessor.lstat(path2.path.resolveSymlinks());
st = path2.resolveSymlinks().lstat();
} catch (Error &) {
continue; // ignore dangling symlinks in ~/.nix-defexpr
}
@ -158,7 +158,7 @@ static void getAllExprs(EvalState & state,
static void loadSourceExpr(EvalState & state, const SourcePath & path, Value & v)
{
auto st = path.accessor.lstat(path.path.resolveSymlinks());
auto st = path.resolveSymlinks().lstat();
if (isNixExpr(path, st))
state.evalFile(path, v);