From 3652326ed281f5f753423acef51103fb8df62a6d Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Wed, 27 May 2020 21:56:34 +0100 Subject: refactor(3p/nix): Anchor local includes at src/ Previously all includes were anchored in one global mess of header files. This moves the includes into filesystem "namespaces" (if you will) for each sub-package of Nix. Note: This commit does not introduce the relevant build system changes. --- .../nix/src/nix-instantiate/nix-instantiate.cc | 24 +++++++++++----------- 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'third_party/nix/src/nix-instantiate') diff --git a/third_party/nix/src/nix-instantiate/nix-instantiate.cc b/third_party/nix/src/nix-instantiate/nix-instantiate.cc index 8e1c7afe1c91..6c77a96ebc07 100644 --- a/third_party/nix/src/nix-instantiate/nix-instantiate.cc +++ b/third_party/nix/src/nix-instantiate/nix-instantiate.cc @@ -1,18 +1,18 @@ #include #include -#include "attr-path.hh" -#include "common-eval-args.hh" -#include "eval-inline.hh" -#include "eval.hh" -#include "get-drvs.hh" -#include "globals.hh" -#include "legacy.hh" -#include "shared.hh" -#include "store-api.hh" -#include "util.hh" -#include "value-to-json.hh" -#include "value-to-xml.hh" +#include "libexpr/attr-path.hh" +#include "libexpr/common-eval-args.hh" +#include "libexpr/eval-inline.hh" +#include "libexpr/eval.hh" +#include "libexpr/get-drvs.hh" +#include "libexpr/value-to-json.hh" +#include "libexpr/value-to-xml.hh" +#include "libmain/shared.hh" +#include "libstore/globals.hh" +#include "libstore/store-api.hh" +#include "libutil/util.hh" +#include "nix/legacy.hh" using namespace nix; -- cgit 1.4.1