1 files changed, 10 insertions, 15 deletions
diff --git a/src/libfetchers/mercurial.cc b/src/libfetchers/mercurial.cc
index 191c5af54..d52d4641b 100644
--- a/src/libfetchers/mercurial.cc
+++ b/src/libfetchers/mercurial.cc
@@ -11,28 +11,27 @@ using namespace std::string_literals;
 
 namespace nix::fetchers {
 
-namespace {
-
-RunOptions hgOptions(const Strings & args)
+static RunOptions hgOptions(const Strings & args)
 {
-    RunOptions opts("hg", args);
-    opts.searchPath = true;
-
     auto env = getEnv();
     // Set HGPLAIN: this means we get consistent output from hg and avoids leakage from a user or system .hgrc.
     env["HGPLAIN"] = "";
-    opts.environment = env;
 
-    return opts;
+    return {
+        .program = "hg",
+        .searchPath = true,
+        .args = args,
+        .environment = env
+    };
 }
 
 // runProgram wrapper that uses hgOptions instead of stock RunOptions.
-string runHg(const Strings & args, const std::optional<std::string> & input = {})
+static string runHg(const Strings & args, const std::optional<std::string> & input = {})
 {
     RunOptions opts = hgOptions(args);
     opts.input = input;
 
-    auto res = runProgram(opts);
+    auto res = runProgram(std::move(opts));
 
     if (!statusOk(res.first))
         throw ExecError(res.first, fmt("hg %1%", statusToString(res.first)));
@@ -40,8 +39,6 @@ string runHg(const Strings & args, const std::optional<std::string> & input = {}
     return res.second;
 }
 
-}
-
 struct MercurialInputScheme : InputScheme
 {
     std::optional<Input> inputFromURL(const ParsedURL & url) override
@@ -254,9 +251,7 @@ struct MercurialInputScheme : InputScheme
            have to pull again. */
         if (!(input.getRev()
                 && pathExists(cacheDir)
-                && runProgram(
-                    hgOptions({ "log", "-R", cacheDir, "-r", input.getRev()->gitRev(), "--template", "1" })
-                    .killStderr(true)).second == "1"))
+                && runProgram(hgOptions({ "log", "-R", cacheDir, "-r", input.getRev()->gitRev(), "--template", "1" })).second == "1"))
         {
             Activity act(*logger, lvlTalkative, actUnknown, fmt("fetching Mercurial repository '%s'", actualUrl));