guiwf/lix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libstore: fix scratch output cleanup

Browse Source 
the daemon must use real store paths, not virtual store paths. using
virtual paths may inadvertently delete paths in the system nix store
when a build was run on a redirected store as root, which isn't good

Change-Id: Id048b236bda0e0ab1f3be6ccba0ddc1de2a3e941
This commit is contained in:
eldritch horrors
2025-06-27 16:37:08 +02:00
parent 151cb75236
commit 779e795732
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libstore/build/local-derivation-goal.cc
+3 -1
View File
@@ -530,7 +530,9 @@ void LocalDerivationGoal::startBuilder()
/* Schedule this scratch output path for automatic deletion /* Schedule this scratch output path for automatic deletion
* if we do not cancel it, e.g. when registering the outputs. * if we do not cancel it, e.g. when registering the outputs.
*/ */
scratchOutputsCleaner.insert_or_assign(outputName, worker.store.printStorePath(scratchPath)); scratchOutputsCleaner.emplace(
outputName, worker.store.toRealPath(worker.store.printStorePath(scratchPath))
);
/* Substitute output placeholders with the scratch output paths. /* Substitute output placeholders with the scratch output paths.
We'll use during the build. */ We'll use during the build. */