diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2023-02-28 11:34:34 -0500 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2023-02-28 11:34:34 -0500 |
| commit | d12f57c2c0ef32180875aa4a0b803c838a7d988f (patch) | |
| tree | 2c046d98bc0bd9171881ff0b6d56fa89c7c642e6 /perl | |
| parent | c36b584f8eb103afa152ef4304cf9fd5c3ebaaf0 (diff) | |
| parent | 4489def1b36aeaee2254159efc1c21c868cc8585 (diff) | |
Merge remote-tracking branch 'upstream/master' into path-info
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 2d759e6fc..c2c95f255 100644 --- a/perl/Makefile +++ b/perl/Makefile @@ -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 diff --git a/perl/lib/Nix/Store.xs b/perl/lib/Nix/Store.xs index 314183383..db733ce40 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(); |