diff options
author | John Ericson <John.Ericson@Obsidian.Systems> | 2023-04-07 09:40:36 -0400 |
---|---|---|
committer | John Ericson <John.Ericson@Obsidian.Systems> | 2023-04-07 09:40:36 -0400 |
commit | c036de086e2f06e6dee1c31e29e05a802f6ccf80 (patch) | |
tree | a3760ae3cec9cabbab39bd95bd2eaab8e2ce2bdf /perl | |
parent | c863e5f338947ecff275a67725ecf50b2a47bdb5 (diff) | |
parent | 81dfc2b01231c65137017de092c8506838fadd94 (diff) |
Merge remote-tracking branch 'upstream/master' into trustless-remote-builder-simple
Diffstat (limited to 'perl')
-rw-r--r-- | perl/Makefile | 2 | ||||
-rw-r--r-- | perl/lib/Nix/Store.xs | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/perl/Makefile b/perl/Makefile index 708f86882..c2c95f255 100644 --- a/perl/Makefile +++ b/perl/Makefile @@ -1,6 +1,6 @@ makefiles = local.mk -GLOBAL_CXXFLAGS += -g -Wall -std=c++17 -I ../src +GLOBAL_CXXFLAGS += -g -Wall -std=c++2a -I ../src -include Makefile.config diff --git a/perl/lib/Nix/Store.xs b/perl/lib/Nix/Store.xs index 54ad1680c..de91dc28d 100644 --- a/perl/lib/Nix/Store.xs +++ b/perl/lib/Nix/Store.xs @@ -26,6 +26,7 @@ static ref<Store> store() static std::shared_ptr<Store> _store; if (!_store) { try { + initLibStore(); loadConfFile(); settings.lockCPU = false; _store = openStore(); |