From cec94738715275ec4761071cefe4a9ae1a565960 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Wed, 23 Sep 2020 15:47:30 +0200
Subject: [PATCH] DerivationGoal::registerOutputs(): Don't canonicalize twice

Fixes #4021.
---
 src/libstore/build.cc | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/src/libstore/build.cc b/src/libstore/build.cc
index 2e23dd979..2979ce010 100644
--- a/src/libstore/build.cc
+++ b/src/libstore/build.cc
@@ -3913,7 +3913,6 @@ void DerivationGoal::registerOutputs()
                 outputRewrites[std::string { scratchPath.hashPart() }] = std::string { finalStorePath.hashPart() };
         };
 
-        bool rewritten = false;
         std::optional<StorePathSet> referencesOpt = std::visit(overloaded {
             [&](AlreadyRegistered skippedFinalPath) -> std::optional<StorePathSet> {
                 finish(skippedFinalPath.path);
@@ -3943,8 +3942,6 @@ void DerivationGoal::registerOutputs()
                 sink.s = make_ref<std::string>(rewriteStrings(*sink.s, outputRewrites));
                 StringSource source(*sink.s);
                 restorePath(actualPath, source);
-
-                rewritten = true;
             }
         };
 
@@ -4125,11 +4122,6 @@ void DerivationGoal::registerOutputs()
             }
         }
 
-        /* Get rid of all weird permissions.  This also checks that
-           all files are owned by the build user, if applicable. */
-        canonicalisePathMetaData(actualPath,
-            buildUser && !rewritten ? buildUser->getUID() : -1, inodesSeen);
-
         if (buildMode == bmCheck) {
             if (!worker.store.isValidPath(newInfo.path)) continue;
             ValidPathInfo oldInfo(*worker.store.queryPathInfo(newInfo.path));