From a58be394769fb174ee4b6ff5ce16744cf5806485 Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Wed, 1 Feb 2023 17:12:11 +0100
Subject: [PATCH] Move sodium_init() to initLibStore()

Part of an effort to make it easier to initialize the right things,
by moving code into the appropriate libraries.
---
 src/libmain/shared.cc   | 5 -----
 src/libstore/globals.cc | 5 +++++
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/libmain/shared.cc b/src/libmain/shared.cc
index 5e19bddb7..8e693fd8d 100644
--- a/src/libmain/shared.cc
+++ b/src/libmain/shared.cc
@@ -28,8 +28,6 @@
 
 #include <openssl/crypto.h>
 
-#include <sodium.h>
-
 
 namespace nix {
 
@@ -164,9 +162,6 @@ void initNix()
     initLibUtil();
     initLibStore();
 
-    if (sodium_init() == -1)
-        throw Error("could not initialise libsodium");
-
     startSignalHandlerThread();
 
     /* Reset SIGCHLD to its default. */
diff --git a/src/libstore/globals.cc b/src/libstore/globals.cc
index b18525dd7..1e66838c5 100644
--- a/src/libstore/globals.cc
+++ b/src/libstore/globals.cc
@@ -13,6 +13,8 @@
 
 #include <nlohmann/json.hpp>
 
+#include <sodium/core.h>
+
 
 namespace nix {
 
@@ -292,6 +294,9 @@ void assertLibStoreInitialized() {
 
 void initLibStore() {
 
+    if (sodium_init() == -1)
+        throw Error("could not initialise libsodium");
+
     loadConfFile();
 
     initLibStoreDone = true;