From 4ad6ce9309e15021d0b5163e6939f782d6aad43e Mon Sep 17 00:00:00 2001 From: Zhaofeng Li Date: Sat, 4 Feb 2023 13:28:47 -0700 Subject: [PATCH] attic/nix_store: Call initNix before connecting to store Fixes #22. --- attic/build.rs | 5 +++++ attic/src/nix_store/bindings/nix.cpp | 1 + attic/src/nix_store/bindings/nix.hpp | 1 + 3 files changed, 7 insertions(+) diff --git a/attic/build.rs b/attic/build.rs index 571a831..392671a 100644 --- a/attic/build.rs +++ b/attic/build.rs @@ -95,4 +95,9 @@ fn run_bindgen() { .atleast_version("2.4") .probe("nix-store") .unwrap(); + + pkg_config::Config::new() + .atleast_version("2.4") + .probe("nix-main") + .unwrap(); } diff --git a/attic/src/nix_store/bindings/nix.cpp b/attic/src/nix_store/bindings/nix.cpp index e63a55e..40597c1 100644 --- a/attic/src/nix_store/bindings/nix.cpp +++ b/attic/src/nix_store/bindings/nix.cpp @@ -76,6 +76,7 @@ RString CPathInfo::ca() { CNixStore::CNixStore() { std::map params; + nix::initNix(); this->store = nix::openStore("auto", params); } diff --git a/attic/src/nix_store/bindings/nix.hpp b/attic/src/nix_store/bindings/nix.hpp index 9fdab63..8f50b1f 100644 --- a/attic/src/nix_store/bindings/nix.hpp +++ b/attic/src/nix_store/bindings/nix.hpp @@ -19,6 +19,7 @@ #include #include #include +#include #include template using RVec = rust::Vec;