Remove callback we don't need for now

Author: Ericson2314

src/libstore-c/nix_api_store.cc

@@ -141,8 +141,8 @@ StorePath * nix_store_parse_path2(nix_c_context * context, StoreDir store_dir, c
     NIXC_CATCH_ERRS_NULL
 }
 
-void
-nix_print_store_path(StoreDir store_dir, const StorePath * path, nix_get_string_callback callback, void * user_data)
+void nix_print_store_path(
+    StoreDir store_dir, const StorePath * path, nix_get_string_callback callback, void * user_data)
 {
     nix::Path sdInner = store_dir.store_directory;
     nix::StoreDirConfig sd{sdInner};
@@ -335,11 +335,7 @@ nix_err nix_derivation_builder_start(nix_c_context * context, DerivationBuilder
     NIXC_CATCH_ERRS
 }
 
-nix_err nix_derivation_builder_finish(
-    nix_c_context * context,
-    DerivationBuilder * builder,
-    void * userdata,
-    void (*callback)(void * userdata, const char * outname, const StorePath * out))
+nix_err nix_derivation_builder_finish(nix_c_context * context, DerivationBuilder * builder)
 {
     try {
         nix::StringSink sink;
@@ -357,13 +353,6 @@ nix_err nix_derivation_builder_finish(
         auto [status, diskFull] = builder->builder->unprepareBuild();
 
         nix::warn("RESULT: %s", nix::statusToString(status));
-
-        if (callback) {
-            for (const auto & [outputName, realisation] : builder->buildResult.builtOutputs) {
-                StorePath p{realisation.outPath};
-                callback(userdata, outputName.c_str(), &p);
-            }
-        }
     }
     NIXC_CATCH_ERRS
 }

src/libstore-c/nix_api_store.h

@@ -248,11 +248,7 @@ DerivationBuilder * nix_make_derivation_builder(
 
 nix_err nix_derivation_builder_start(nix_c_context * context, DerivationBuilder * builder);
 
-nix_err nix_derivation_builder_finish(
-    nix_c_context * context,
-    DerivationBuilder * builder,
-    void * userdata,
-    void (*callback)(void * userdata, const char * outname, const StorePath * out));
+nix_err nix_derivation_builder_finish(nix_c_context * context, DerivationBuilder * builder);
 
 void nix_derivation_builder_free(DerivationBuilder * builder);
 

src/libstore-tests/nix_api_store.cc

@@ -310,31 +310,9 @@ TEST_F(nix_api_store_test_base, build_using_builder)
     assert_ctx_ok();
     ASSERT_EQ(ret, NIX_OK);
 
-    auto cb = LambdaAdapter{.fun = [&](const char * outname, const StorePath * outPath) {
-        auto cb2 = LambdaAdapter{.fun = [&](const char * str, unsigned int) {
-            nix::warn("WE JUST MADE THIS %s", str);
-            bool ret = exists(std::filesystem::path{str});
-            EXPECT_TRUE(ret);
-            assert(ret);
-        }};
-
-        void (*fp2)(const char *, unsigned int, decltype(cb2) *) = decltype(cb2)::call2<const char *, unsigned int>;
-        nix_print_store_path(
-            sd,
-            outPath,
-            reinterpret_cast<void (*)(const char *, unsigned int, void *)>(fp2),
-            static_cast<void *>(&cb2));
-    }};
-
-    void (*fp)(decltype(cb) *, const char *, const StorePath *) = decltype(cb)::call<const char *, const StorePath *>;
-
     // Finish the build, i.e. cleanup (TODO expose pipe, so rather than just blocking,
     // the caller do its own event loop before calling this)
-    ret = nix_derivation_builder_finish(
-        ctx,
-        builder,
-        static_cast<void *>(&cb),
-        reinterpret_cast<void (*)(void *, const char *, const StorePath *)>(fp));
+    ret = nix_derivation_builder_finish(ctx, builder);
     assert_ctx_ok();
     ASSERT_EQ(ret, NIX_OK);