Befator-Inc-Firmen-Netzwerk/nix
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nix/develop: Remove usage of toRealPath, replace with SourceAccessor

Browse Source
This commit is contained in:
Sergei Zimmerman
2025-10-15 00:48:39 +03:00
parent 918a3cebaa
commit 0347958dd2
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/nix/develop.cc
View File

@@ -299,11 +299,9 @@ static StorePath getDerivationEnvironment(ref<Store> store, ref<Store> evalStore
for (auto & [_0, optPath] : evalStore->queryPartialDerivationOutputMap(shellDrvPath)) {
assert(optPath);
auto & outPath = *optPath;
assert(store->isValidPath(outPath));
auto outPathS = store->toRealPath(outPath);
if (lstat(outPathS).st_size)
return outPath;
auto accessor = evalStore->requireStoreObjectAccessor(*optPath);
if (auto st = accessor->maybeLstat(CanonPath::root); st && st->fileSize.value_or(0))
return *optPath;
}
throw Error("get-env.sh failed to produce an environment");
@@ -502,7 +500,9 @@ struct Common : InstallableCommand, MixProfile
debug("reading environment file '%s'", strPath);
return {BuildEnvironment::parseJSON(readFile(store->toRealPath(shellOutPath))), strPath};
return {
BuildEnvironment::parseJSON(store->requireStoreObjectAccessor(shellOutPath)->readFile(CanonPath::root)),
strPath};
}
};