diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2020-09-17 16:33:10 +0000 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2020-09-17 16:33:10 +0000 |
| commit | b7df353f27b3bd6c1addb98dae19dcc973c1b698 (patch) | |
| tree | 1f03dab04affc482e7dcac19ff147ea9e68d3228 /src/libstore/local-store.cc | |
| parent | 2741fffa350ec59d29ade24dd93007d535a61bde (diff) | |
| parent | 649d3aaf2481b928120b6ce77d68b1b7c68f69e6 (diff) | |
Merge remote-tracking branch 'upstream/master' into ca-floating-upstream
Diffstat (limited to 'src/libstore/local-store.cc')
| -rw-r--r-- | src/libstore/local-store.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/libstore/local-store.cc b/src/libstore/local-store.cc index 0755cfa91..8d9a202ce 100644 --- a/src/libstore/local-store.cc +++ b/src/libstore/local-store.cc @@ -42,7 +42,8 @@ namespace nix { LocalStore::LocalStore(const Params & params) - : Store(params) + : StoreConfig(params) + , Store(params) , LocalFSStore(params) , realStoreDir_{this, false, rootDir != "" ? rootDir + "/nix/store" : storeDir, "real", "physical path to the Nix store"} |