nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-15 23:12:44 +01:00
Code Activity

Merge remote-tracking branch 'upstream/master' into ca-floating-upstream

Browse source
This commit is contained in:
John Ericson 2020-09-17 16:33:10 +00:00
commit b7df353f27
59 changed files with 662 additions and 491 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/libstore/local-store.cc
View file

@ -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"}