mirror of
https://github.com/NixOS/nix.git
synced 2025-11-13 14:02:42 +01:00
Move autoDelChroot
This commit is contained in:
parent
5d96e55e91
commit
f5176500be
2 changed files with 12 additions and 9 deletions
|
|
@ -117,12 +117,6 @@ protected:
|
|||
*/
|
||||
Path tmpDirInSandbox;
|
||||
|
||||
/**
|
||||
* RAII object to delete the chroot directory.
|
||||
*/
|
||||
// FIXME: move
|
||||
std::shared_ptr<AutoDelete> autoDelChroot;
|
||||
|
||||
/**
|
||||
* The sort of derivation we are building.
|
||||
*
|
||||
|
|
@ -564,9 +558,6 @@ std::variant<std::pair<BuildResult::Status, Error>, SingleDrvOutputs> Derivation
|
|||
for (auto & i : redirectedOutputs)
|
||||
deletePath(store.Store::toRealPath(i.second));
|
||||
|
||||
/* Delete the chroot (if we were using one). */
|
||||
autoDelChroot.reset(); /* this runs the destructor */
|
||||
|
||||
deleteTmpDir(true);
|
||||
|
||||
return std::move(builtOutputs);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue