diff options
| author | Vincent Ambo <tazjin@google.com> | 2020-05-27T20·56+0100 |
|---|---|---|
| committer | Vincent Ambo <tazjin@google.com> | 2020-05-27T20·56+0100 |
| commit | 3652326ed281f5f753423acef51103fb8df62a6d (patch) | |
| tree | 3e6969ccaa13e77eb42f887cd081b45d7fffed80 /third_party/nix/src/libstore/builtins | |
| parent | 86a35d963d7b6108dec44411c8ebd5aadbb148ac (diff) | |
refactor(3p/nix): Anchor local includes at src/ r/865
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.
Diffstat (limited to 'third_party/nix/src/libstore/builtins')
| -rw-r--r-- | third_party/nix/src/libstore/builtins/buildenv.cc | 2 | ||||
| -rw-r--r-- | third_party/nix/src/libstore/builtins/fetchurl.cc | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/third_party/nix/src/libstore/builtins/buildenv.cc b/third_party/nix/src/libstore/builtins/buildenv.cc index db093663bfef..95f915227bb1 100644 --- a/third_party/nix/src/libstore/builtins/buildenv.cc +++ b/third_party/nix/src/libstore/builtins/buildenv.cc @@ -7,7 +7,7 @@ #include <sys/stat.h> #include <sys/types.h> -#include "builtins.hh" +#include "libstore/builtins.hh" namespace nix { diff --git a/third_party/nix/src/libstore/builtins/fetchurl.cc b/third_party/nix/src/libstore/builtins/fetchurl.cc index 90814f6d7f0b..867a120e8d4a 100644 --- a/third_party/nix/src/libstore/builtins/fetchurl.cc +++ b/third_party/nix/src/libstore/builtins/fetchurl.cc @@ -1,11 +1,11 @@ #include <absl/strings/match.h> #include <glog/logging.h> -#include "archive.hh" -#include "builtins.hh" -#include "compression.hh" -#include "download.hh" -#include "store-api.hh" +#include "libstore/builtins.hh" +#include "libstore/download.hh" +#include "libstore/store-api.hh" +#include "libutil/archive.hh" +#include "libutil/compression.hh" namespace nix { |