From ac676856061677559a21670940ac2fac98add9a0 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Tue, 18 Jun 2019 16:01:35 +0200
Subject: Make subcommand construction in MultiCommand lazy

(cherry picked from commit a0de58f471c9087d8e6cc60a6078f9940a125b15)
---
 src/nix/run.cc | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'src/nix/run.cc')

diff --git a/src/nix/run.cc b/src/nix/run.cc
index fd4f92282..ece4d3854 100644
--- a/src/nix/run.cc
+++ b/src/nix/run.cc
@@ -61,11 +61,6 @@ struct CmdRun : InstallablesCommand
             .handler([&](std::vector<std::string> ss) { unset.insert(ss.front()); });
     }
 
-    std::string name() override
-    {
-        return "run";
-    }
-
     std::string description() override
     {
         return "run a shell in which the specified packages are available";
@@ -182,7 +177,7 @@ struct CmdRun : InstallablesCommand
     }
 };
 
-static RegisterCommand r1(make_ref<CmdRun>());
+static auto r1 = registerCommand<CmdRun>("run");
 
 void chrootHelper(int argc, char * * argv)
 {
-- 
cgit v1.2.3