From fbffd47fb715396f47be21ae0ed1a7f484852b4b Mon Sep 17 00:00:00 2001
From: Sergei Zimmerman <145775305+xokdvium@users.noreply.github.com>
Date: Sun, 24 Nov 2024 00:35:47 +0300
Subject: [PATCH] build(lib{expr,store,util}-test-support): depend on -c
 libraries

Since lib{expr,store,util}-test-support subprojects define nix_api_* helpers
for testing nix c bindings, they need to publicly depend on -c counterparts.
This makes their headers self-sufficient and does not rely on the -tests to add
necessary dependencies.
---
 src/libexpr-test-support/meson.build  | 1 +
 src/libexpr-test-support/package.nix  | 2 ++
 src/libstore-test-support/meson.build | 1 +
 src/libstore-test-support/package.nix | 2 ++
 src/libutil-test-support/meson.build  | 1 +
 src/libutil-test-support/package.nix  | 2 ++
 6 files changed, 9 insertions(+)

diff --git a/src/libexpr-test-support/meson.build b/src/libexpr-test-support/meson.build
index bdfd435a8..33d9e17a6 100644
--- a/src/libexpr-test-support/meson.build
+++ b/src/libexpr-test-support/meson.build
@@ -24,6 +24,7 @@ deps_public_maybe_subproject = [
   dependency('nix-store'),
   dependency('nix-store-test-support'),
   dependency('nix-expr'),
+  dependency('nix-expr-c'),
 ]
 subdir('build-utils-meson/subprojects')
 
diff --git a/src/libexpr-test-support/package.nix b/src/libexpr-test-support/package.nix
index bcf6118e0..7e92d145f 100644
--- a/src/libexpr-test-support/package.nix
+++ b/src/libexpr-test-support/package.nix
@@ -4,6 +4,7 @@
 
 , nix-store-test-support
 , nix-expr
+, nix-expr-c
 
 , rapidcheck
 
@@ -35,6 +36,7 @@ mkMesonLibrary (finalAttrs: {
   propagatedBuildInputs = [
     nix-store-test-support
     nix-expr
+    nix-expr-c
     rapidcheck
   ];
 
diff --git a/src/libstore-test-support/meson.build b/src/libstore-test-support/meson.build
index f8308e7bb..1f230914f 100644
--- a/src/libstore-test-support/meson.build
+++ b/src/libstore-test-support/meson.build
@@ -22,6 +22,7 @@ deps_public_maybe_subproject = [
   dependency('nix-util'),
   dependency('nix-util-test-support'),
   dependency('nix-store'),
+  dependency('nix-store-c'),
 ]
 subdir('build-utils-meson/subprojects')
 
diff --git a/src/libstore-test-support/package.nix b/src/libstore-test-support/package.nix
index 48f8b5e6b..2543049fe 100644
--- a/src/libstore-test-support/package.nix
+++ b/src/libstore-test-support/package.nix
@@ -4,6 +4,7 @@
 
 , nix-util-test-support
 , nix-store
+, nix-store-c
 
 , rapidcheck
 
@@ -35,6 +36,7 @@ mkMesonLibrary (finalAttrs: {
   propagatedBuildInputs = [
     nix-util-test-support
     nix-store
+    nix-store-c
     rapidcheck
   ];
 
diff --git a/src/libutil-test-support/meson.build b/src/libutil-test-support/meson.build
index fa1df7320..4afed01ca 100644
--- a/src/libutil-test-support/meson.build
+++ b/src/libutil-test-support/meson.build
@@ -20,6 +20,7 @@ deps_private_maybe_subproject = [
 ]
 deps_public_maybe_subproject = [
   dependency('nix-util'),
+  dependency('nix-util-c'),
 ]
 subdir('build-utils-meson/subprojects')
 
diff --git a/src/libutil-test-support/package.nix b/src/libutil-test-support/package.nix
index 2525e1602..c403e762c 100644
--- a/src/libutil-test-support/package.nix
+++ b/src/libutil-test-support/package.nix
@@ -3,6 +3,7 @@
 , mkMesonLibrary
 
 , nix-util
+, nix-util-c
 
 , rapidcheck
 
@@ -33,6 +34,7 @@ mkMesonLibrary (finalAttrs: {
 
   propagatedBuildInputs = [
     nix-util
+    nix-util-c
     rapidcheck
   ];