diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2020-10-12 17:20:46 +0000 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2020-10-12 17:20:46 +0000 |
| commit | a73959e6beef05e84c283a2117bbe7dc5801bade (patch) | |
| tree | 83382478e91935222640051ef483f11142a845a4 /src/nix-env | |
| parent | d334fd48824b41b57e267cd2926fa9619b7718e3 (diff) | |
| parent | 20d2140e450b066a521933dd322d089fd6c248fa (diff) | |
Merge remote-tracking branch 'upstream/master' into split_build_cc
Diffstat (limited to 'src/nix-env')
| -rw-r--r-- | src/nix-env/nix-env.cc | 1 | ||||
| -rw-r--r-- | src/nix-env/user-env.cc | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/src/nix-env/nix-env.cc b/src/nix-env/nix-env.cc index e6667e7f5..a4b5c9e2c 100644 --- a/src/nix-env/nix-env.cc +++ b/src/nix-env/nix-env.cc @@ -8,6 +8,7 @@ #include "profiles.hh" #include "shared.hh" #include "store-api.hh" +#include "local-fs-store.hh" #include "user-env.hh" #include "util.hh" #include "json.hh" diff --git a/src/nix-env/user-env.cc b/src/nix-env/user-env.cc index 8c6c8af05..87387e794 100644 --- a/src/nix-env/user-env.cc +++ b/src/nix-env/user-env.cc @@ -2,6 +2,7 @@ #include "util.hh" #include "derivations.hh" #include "store-api.hh" +#include "local-fs-store.hh" #include "globals.hh" #include "shared.hh" #include "eval.hh" |