diff options
author | Carlo Nucera <carlo.nucera@protonmail.com> | 2020-06-01 17:13:11 -0400 |
---|---|---|
committer | Carlo Nucera <carlo.nucera@protonmail.com> | 2020-06-01 17:13:11 -0400 |
commit | 0cb67ecbd318a455fa4b459e29fadd0848238fca (patch) | |
tree | 77818a525fe0cdc04621ca2829d459be555d9742 /src/libexpr | |
parent | f4b89e11a4d9d6e50720fbe0db9041b6fe442cd5 (diff) | |
parent | bcde5456cc3295061a0726881c3e441444dd6680 (diff) |
Merge branch 'derivation-header-include-order' of github.com:Ericson2314/nix into validPathInfo-ca-proper-datatype
Diffstat (limited to 'src/libexpr')
-rw-r--r-- | src/libexpr/get-drvs.cc | 2 | ||||
-rw-r--r-- | src/libexpr/primops/context.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/libexpr/get-drvs.cc b/src/libexpr/get-drvs.cc index ca9c547fa..16f7b5637 100644 --- a/src/libexpr/get-drvs.cc +++ b/src/libexpr/get-drvs.cc @@ -1,7 +1,7 @@ #include "get-drvs.hh" #include "util.hh" #include "eval-inline.hh" -#include "derivations.hh" +#include "store-api.hh" #include <cstring> #include <regex> diff --git a/src/libexpr/primops/context.cc b/src/libexpr/primops/context.cc index 94fa0158c..66d8bab1f 100644 --- a/src/libexpr/primops/context.cc +++ b/src/libexpr/primops/context.cc @@ -1,6 +1,6 @@ #include "primops.hh" #include "eval-inline.hh" -#include "derivations.hh" +#include "store-api.hh" namespace nix { |