1 files changed, 7 insertions, 7 deletions
diff --git a/src/libstore/build/derivation-goal.cc b/src/libstore/build/derivation-goal.cc
index 876b8def0..b58d04c05 100644
--- a/src/libstore/build/derivation-goal.cc
+++ b/src/libstore/build/derivation-goal.cc
@@ -566,7 +566,7 @@ void DerivationGoal::tryToBuild()
                 lockFiles.insert(worker.store.Store::toRealPath(*i.second.second));
             else
                 lockFiles.insert(
-                    worker.store.Store::toRealPath(drvPath) + "!" + i.first
+                    worker.store.Store::toRealPath(drvPath) + "." + i.first
                 );
         }
     }
@@ -774,9 +774,6 @@ void runPostBuildHook(
     hookEnvironment.emplace("OUT_PATHS", chomp(concatStringsSep(" ", store.printStorePathSet(outputPaths))));
     hookEnvironment.emplace("NIX_CONFIG", globalConfig.toKeyValue());
 
-    RunOptions opts(settings.postBuildHook, {});
-    opts.environment = hookEnvironment;
-
     struct LogSink : Sink {
         Activity & act;
         std::string currentLine;
@@ -807,9 +804,12 @@ void runPostBuildHook(
     };
     LogSink sink(act);
 
-    opts.standardOut = &sink;
-    opts.mergeStderrToStdout = true;
-    runProgram2(opts);
+    runProgram2({
+        .program = settings.postBuildHook,
+        .environment = hookEnvironment,
+        .standardOut = &sink,
+        .mergeStderrToStdout = true,
+    });
 }
 
 void DerivationGoal::buildDone()