python: initNix -> initLibStore

NixOS · Apr 19, 2023 · 57e71a3 · 57e71a3
1 parent 2cb9dd0
commit 57e71a3
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/python/meson.build b/python/meson.build
@@ -7,7 +7,6 @@ python_mod = import('python')
 py_installation = python_mod.find_installation()
 
 nix_expr_dep = dependency('nix-expr', required: true)
-nix_main_dep = dependency('nix-main', required: true)
 
 subdir('src')
 

diff --git a/python/src/meson.build b/python/src/meson.build
@@ -6,7 +6,7 @@ src = [
 ]
 
 nix_bindings = py_installation.extension_module('nix', src,
-    dependencies : [nix_expr_dep, nix_main_dep],
+    dependencies : [nix_expr_dep],
     install: true,
     cpp_args: [
       '-std=c++17',

diff --git a/python/src/python-module.cc b/python/src/python-module.cc
@@ -32,7 +32,7 @@ extern "C" _public_ PyObject * PyInit_nix(void)
     nix::settings.buildHook = nix::settings.nixBinDir + "/nix __build-remote";
     // And by setting buildHook before calling initNix, we can override the defaults without overriding the
     // user-provided options from the config files
-    nix::initNix();
+    nix::initLibStore();
     nix::initGC();
 
     PyObjPtr m(PyModule_Create(&nixmodule));