Move fetchSettings back to libfetchers

This is needed for builtin:fetch-tree to get access to it.

Author: edolstra

src/libcmd/common-eval-args.cc

@@ -20,10 +20,6 @@ namespace nix {
 
 namespace fs { using namespace std::filesystem; }
 
-fetchers::Settings fetchSettings;
-
-static GlobalConfig::Register rFetchSettings(&fetchSettings);
-
 EvalSettings evalSettings {
     settings.readOnlyMode,
     {

src/libcmd/include/nix/cmd/common-eval-args.hh

@@ -22,9 +22,6 @@ struct SourcePath;
 
 namespace flake { struct Settings; }
 
-/**
- * @todo Get rid of global setttings variables
- */
 extern fetchers::Settings fetchSettings;
 
 /**

src/libfetchers/fetch-settings.cc

@@ -1,4 +1,5 @@
 #include "nix/fetchers/fetch-settings.hh"
+#include "nix/util/config-global.hh"
 
 namespace nix::fetchers {
 
@@ -7,3 +8,11 @@ Settings::Settings()
 }
 
 }
+
+namespace nix {
+
+fetchers::Settings fetchSettings;
+
+static GlobalConfig::Register rFetchSettings(&fetchSettings);
+
+}

src/libfetchers/include/nix/fetchers/fetch-settings.hh

@@ -109,3 +109,12 @@ struct Settings : public Config
 };
 
 }
+
+namespace nix {
+
+/**
+ * @todo Get rid of global setttings variables
+ */
+extern fetchers::Settings fetchSettings;
+
+}