From 5089f1292dabd01e9d27c5752e498d9a00f13b0d Mon Sep 17 00:00:00 2001 From: Jeremy Fleischman Date: Tue, 29 Apr 2025 18:37:20 -0700 Subject: [PATCH] Refactor, use `MixOutLinkByDefault` --- src/nix/formatter.cc | 27 +++------------------------ 1 file changed, 3 insertions(+), 24 deletions(-) diff --git a/src/nix/formatter.cc b/src/nix/formatter.cc index f4cde7d68..8b171b244 100644 --- a/src/nix/formatter.cc +++ b/src/nix/formatter.cc @@ -93,27 +93,9 @@ struct CmdFormatterRun : MixFormatter, MixJSON static auto rFormatterRun = registerCommand2({"formatter", "run"}); -struct CmdFormatterBuild : MixFormatter +struct CmdFormatterBuild : MixFormatter, MixOutLinkByDefault { - Path outLink = "result"; - - CmdFormatterBuild() - { - addFlag({ - .longName = "out-link", - .shortName = 'o', - .description = "Use *path* as prefix for the symlink to the build result. It defaults to `result`.", - .labels = {"path"}, - .handler = {&outLink}, - .completer = completePath, - }); - - addFlag({ - .longName = "no-link", - .description = "Do not create symlink to the build results.", - .handler = {&outLink, Path("")}, - }); - } + CmdFormatterBuild() {} std::string description() override { @@ -142,10 +124,7 @@ struct CmdFormatterBuild : MixFormatter auto unresolvedApp = installable.toApp(*evalState); auto app = unresolvedApp.resolve(evalStore, store); auto buildables = unresolvedApp.build(evalStore, store); - - if (outLink != "") - if (auto store2 = store.dynamic_pointer_cast()) - createOutLinks(outLink, toBuiltPaths(buildables), *store2); + createOutLinksMaybe(buildables, store); logger->cout("%s", app.program); };