diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2021-01-06 17:56:53 +0100 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2021-01-06 17:56:53 +0100 |
| commit | 0df69d96e02ce4c9e17bd33333c5d78313341dd3 (patch) | |
| tree | fea6aa6a86b8c51ac97ec20db43e46347c102ede /src/libmain/shared.cc | |
| parent | 9374c2baeabe45a22e4b8746dc97f5ce4f030184 (diff) | |
Make sodium a required dependency
Diffstat (limited to 'src/libmain/shared.cc')
| -rw-r--r-- | src/libmain/shared.cc | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/libmain/shared.cc b/src/libmain/shared.cc index e9f067e35..6751a3744 100644 --- a/src/libmain/shared.cc +++ b/src/libmain/shared.cc @@ -18,9 +18,7 @@ #include <openssl/crypto.h> -#if HAVE_SODIUM #include <sodium.h> -#endif namespace nix { @@ -130,10 +128,8 @@ void initNix() CRYPTO_set_locking_callback(opensslLockCallback); #endif -#if HAVE_SODIUM if (sodium_init() == -1) throw Error("could not initialise libsodium"); -#endif loadConfFile(); @@ -283,9 +279,7 @@ void printVersion(const string & programName) #if HAVE_BOEHMGC cfg.push_back("gc"); #endif -#if HAVE_SODIUM cfg.push_back("signed-caches"); -#endif std::cout << "System type: " << settings.thisSystem << "\n"; std::cout << "Additional system types: " << concatStringsSep(", ", settings.extraPlatforms.get()) << "\n"; std::cout << "Features: " << concatStringsSep(", ", cfg) << "\n"; |