mirror of
https://github.com/NixOS/nix
synced 2025-07-06 21:41:48 +02:00
Merge remote-tracking branch 'upstream/master' into path-info
This commit is contained in:
commit
d12f57c2c0
132 changed files with 2799 additions and 1267 deletions
|
@ -1,6 +1,6 @@
|
|||
makefiles = local.mk
|
||||
|
||||
GLOBAL_CXXFLAGS += -g -Wall -std=c++20 -I ../src
|
||||
GLOBAL_CXXFLAGS += -g -Wall -std=c++2a -I ../src
|
||||
|
||||
-include Makefile.config
|
||||
|
||||
|
|
|
@ -26,6 +26,7 @@ static ref<Store> store()
|
|||
static std::shared_ptr<Store> _store;
|
||||
if (!_store) {
|
||||
try {
|
||||
initLibStore();
|
||||
loadConfFile();
|
||||
settings.lockCPU = false;
|
||||
_store = openStore();
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue