*: fix non-local-dir includes

these ended up referring to different directories and would break during
source reorganization (or even just including them in different places).

Change-Id: I91e8db04e3d3565efd5920982ed5bc59d2c27058

lix/libexpr/eval-settings.hh

@@ -14,7 +14,7 @@ struct EvalSettings : Config
 
     static std::string resolvePseudoUrl(std::string_view url);
 
-    #include "libexpr-settings.gen.inc"
+#include "lix/libexpr/libexpr-settings.gen.inc"
 
     /**
      * Implements the `eval-system` vs `system` defaulting logic

lix/libexpr/parser/parser-impl1.inc.cc

@@ -1,4 +1,4 @@
-#include "eval-settings.hh"
+#include "lix/libexpr/eval-settings.hh"
 #include "lix/libexpr/nixexpr.hh"
 #include "lix/libexpr/parser/change_head.hh"
 #include "lix/libexpr/parser/grammar.hh"

lix/libexpr/primops/context.cc

@@ -3,7 +3,7 @@
 #include "lix/libstore/derivations.hh"
 #include "lix/libstore/store-api.hh"
 #include "lix/libutil/types.hh"
-#include "value.hh"
+#include "lix/libexpr/value.hh"
 
 namespace nix {
 

lix/libexpr/primops/fromTOML.cc

@@ -1,6 +1,6 @@
 #include "lix/libexpr/eval.hh"
 #include "lix/libexpr/extra-primops.hh"
-#include "value.hh"
+#include "lix/libexpr/value.hh"
 
 #include <sstream>
 #include <toml.hpp>

lix/libfetchers/fetch-settings.hh

@@ -20,7 +20,7 @@ struct FetchSettings : public Config
 {
     FetchSettings();
 
-    #include "libfetchers-settings.gen.inc"
+#include "lix/libfetchers/libfetchers-settings.gen.inc"
 };
 
 // FIXME: don't use a global variable.

lix/libstore/build/local-derivation-goal.cc

@@ -1,5 +1,5 @@
 #include "lix/libstore/build/local-derivation-goal.hh"
-#include "build/derivation-goal.hh"
+#include "derivation-goal.hh"
 #include "lix/libutil/async-io.hh"
 #include "lix/libutil/async.hh"
 #include "lix/libutil/error.hh"
@@ -29,8 +29,8 @@
 #include "lix/libutil/mount.hh"
 #include "lix/libutil/strings.hh"
 #include "lix/libutil/thread-name.hh"
-#include "platform/linux.hh"
-#include "path-tree.hh"
+#include "lix/libstore/platform/linux.hh"
+#include "lix/libstore/path-tree.hh"
 
 #include <cstddef>
 #include <dirent.h>

lix/libstore/build/worker.cc

@@ -1,4 +1,4 @@
-#include "build/derivation-goal.hh"
+#include "derivation-goal.hh"
 #include "lix/libutil/async-collect.hh"
 #include "lix/libutil/async.hh"
 #include "lix/libutil/charptr-cast.hh"

lix/libstore/filetransfer.hh

@@ -19,7 +19,7 @@ namespace nix {
 
 struct FileTransferSettings : Config
 {
-    #include "file-transfer-settings.gen.inc"
+#include "lix/libstore/file-transfer-settings.gen.inc"
 };
 
 extern FileTransferSettings fileTransferSettings;

lix/libstore/globals.hh

@@ -132,7 +132,7 @@ public:
      */
     bool readOnlyMode = false;
 
-    #include "libstore-settings.gen.inc"
+#include "lix/libstore/libstore-settings.gen.inc"
 };
 
 

lix/libutil/config.hh

@@ -332,7 +332,7 @@ extern GlobalConfig globalConfig;
 
 
 struct FeatureSettings : Config {
-    #include "feature-settings.gen.inc"
+#include "lix/libutil/feature-settings.gen.inc"
 
     /**
      * Check whether the given experimental feature is enabled.

lix/libutil/deprecated-features.hh

@@ -14,9 +14,8 @@ namespace nix {
  * Reminder: New deprecated features should start out with a warning without throwing an error.
  * See the developer documentation for details.
  */
-enum struct DeprecatedFeature
-{
-    #include "deprecated-features.gen.inc"
+enum struct DeprecatedFeature {
+#include "lix/libutil/deprecated-features.gen.inc"
     NumDepFeatures, // number of available deprecated features, do not use
 };
 

lix/libutil/experimental-features.hh

@@ -11,9 +11,8 @@ namespace nix {
 /**
  * The list of available experimental features.
  */
-enum struct ExperimentalFeature
-{
-    #include "experimental-features.gen.inc"
+enum struct ExperimentalFeature {
+#include "lix/libutil/experimental-features.gen.inc"
     NumXpFeatures, // number of available experimental features, do not use
 };
 

lix/libutil/logging-rpc.hh

@@ -1,7 +1,7 @@
 #pragma once
 ///@file
 
-#include "logging.capnp.h"
+#include "lix/libutil/logging.capnp.h"
 #include "logging.hh"
 #include "rpc.hh" // IWYU pragma: keep
 #include <optional>

lix/libutil/logging.hh

@@ -97,7 +97,7 @@ typedef uint64_t ActivityId;
 
 struct LoggerSettings : Config
 {
-    #include "logging-settings.gen.inc"
+#include "lix/libutil/logging-settings.gen.inc"
 };
 
 extern LoggerSettings loggerSettings;