From b63d4a0c622fa556695e7666b9b3bde920904920 Mon Sep 17 00:00:00 2001
From: Rebecca Turner <rbt@sent.as>
Date: Tue, 10 Sep 2024 13:13:19 -0700
Subject: Remove static initializers for `RegisterLegacyCommand`

This moves the "legacy"/"nix2" commands under a new `src/legacy/`
directory, instead of being scattered around in a bunch of different
directories.

A new `liblegacy` build target is defined, and the `nix` binary is
linked against it.

Then, `RegisterLegacyCommand` is replaced with `LegacyCommand::add`
calls in functions like `registerNixCollectGarbage()`. These
registration functions are called explicitly in `src/nix/main.cc`.

See: https://git.lix.systems/lix-project/lix/issues/359

Change-Id: Id450ffc3f793374907599cfcc121863b792aac1a
---
 src/nix/hash.cc | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

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

diff --git a/src/nix/hash.cc b/src/nix/hash.cc
index f6add527a..40b00c978 100644
--- a/src/nix/hash.cc
+++ b/src/nix/hash.cc
@@ -5,8 +5,9 @@
 #include "shared.hh"
 #include "references.hh"
 #include "archive.hh"
+#include "hash-command.hh"
 
-using namespace nix;
+namespace nix {
 
 struct CmdHashBase : Command
 {
@@ -221,4 +222,8 @@ static int compatNixHash(int argc, char * * argv)
     return 0;
 }
 
-static RegisterLegacyCommand r_nix_hash("nix-hash", compatNixHash);
+void registerNixHash() {
+    LegacyCommands::add("nix-hash", compatNixHash);
+}
+
+}
-- 
cgit v1.2.3