wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-25 10:41:16 +02:00
Code Activity

create pathAccessible, use it to infer default dirs

Browse source
This commit is contained in:
Yorick van Pelt 2023-05-26 15:32:28 +02:00
parent a6c78ba367
commit 2c462486fe
No known key found for this signature in database
GPG key ID: D8D3CC6D951384DE
5 changed files with 26 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/libexpr/eval.cc
View file

@ -2620,17 +2620,12 @@ Strings EvalSettings::getDefaultNixPath()
{
Strings res;
auto add = [&](const Path & p, const std::string & s = std::string()) {
try {
if (pathExists(p)) {
if (s.empty()) {
res.push_back(p);
} else {
res.push_back(s + "=" + p);
}
if (pathAccessible(p)) {
if (s.empty()) {
res.push_back(p);
} else {
res.push_back(s + "=" + p);
}
} catch (SysError & e) {
// swallow EPERM
if (e.errNo != EPERM) throw;
}
};