Merge remote-tracking branch 'upstream/master' into templated-daemon-protocol

1 files changed, 13 insertions, 0 deletions

diff --git a/src/libstore/globals.hh b/src/libstore/globals.hh
index 8a2d3ff75..ebcfa9d80 100644
--- a/src/libstore/globals.hh
+++ b/src/libstore/globals.hh
@@ -880,6 +880,19 @@ public:
 
     Setting<std::string> flakeRegistry{this, "https://github.com/NixOS/flake-registry/raw/master/flake-registry.json", "flake-registry",
         "Path or URI of the global flake registry."};
+
+    Setting<bool> allowSymlinkedStore{
+        this, false, "allow-symlinked-store",
+        R"(
+          If set to `true`, Nix will stop complaining if the store directory
+          (typically /nix/store) contains symlink components.
+
+          This risks making some builds "impure" because builders sometimes
+          "canonicalise" paths by resolving all symlink components. Problems
+          occur if those builds are then deployed to machines where /nix/store
+          resolves to a different location from that of the build machine. You
+          can enable this setting if you are sure you're not going to do that.
+        )"};
 };