From bc22a7ee6a6d9367f3197cf31a5fdd477b155974 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 6 Jan 2020 22:18:00 +0100 Subject: [PATCH] Fix use of uninitialized store path Fixes 'building of '/nix/store/00000000000000000000000000000000-': ...'. --- src/libstore/build.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/libstore/build.cc b/src/libstore/build.cc index 4c07865e9..e1171082b 100644 --- a/src/libstore/build.cc +++ b/src/libstore/build.cc @@ -1016,7 +1016,7 @@ DerivationGoal::DerivationGoal(StorePath && drvPath, const StringSet & wantedOut , buildMode(buildMode) { state = &DerivationGoal::getDerivation; - name = fmt("building of '%s'", worker.store.printStorePath(drvPath)); + name = fmt("building of '%s'", worker.store.printStorePath(this->drvPath)); trace("created"); mcExpectedBuilds = std::make_unique>(worker.expectedBuilds); @@ -1041,7 +1041,7 @@ DerivationGoal::DerivationGoal(StorePath && drvPath, const BasicDerivation & drv /* Prevent the .chroot directory from being garbage-collected. (See isActiveTempFile() in gc.cc.) */ - worker.store.addTempRoot(drvPath); + worker.store.addTempRoot(this->drvPath); } @@ -4259,7 +4259,7 @@ SubstitutionGoal::SubstitutionGoal(StorePath && storePath, Worker & worker, Repa , repair(repair) { state = &SubstitutionGoal::init; - name = fmt("substitution of '%s'", worker.store.printStorePath(storePath)); + name = fmt("substitution of '%s'", worker.store.printStorePath(this->storePath)); trace("created"); maintainExpectedSubstitutions = std::make_unique>(worker.expectedSubstitutions); }