From 57e71a381d6b72165abcad8210c6536cebd947f3 Mon Sep 17 00:00:00 2001 From: Yorick van Pelt Date: Wed, 19 Apr 2023 14:58:03 +0200 Subject: [PATCH] python: initNix -> initLibStore --- python/meson.build | 1 - python/src/meson.build | 2 +- python/src/python-module.cc | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/python/meson.build b/python/meson.build index 6a212749c3b..eb31ffca1ba 100644 --- 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 index e95c1482d67..49b94a2b752 100644 --- 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 index c1b1eb51e83..67549577dc3 100644 --- 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));