From bce29ab2cf744cce2f0a33d21ac6102f32c1dd0a Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Tue, 19 Aug 2025 17:48:29 -0400
Subject: [PATCH] Move header outside Unix-only portion

We'll neeed some definitions elsewhere
---
 .../{unix => }/include/nix/store/build/derivation-builder.hh    | 2 ++
 src/libstore/include/nix/store/meson.build                      | 1 +
 src/libstore/unix/include/nix/store/meson.build                 | 1 -
 3 files changed, 3 insertions(+), 1 deletion(-)
 rename src/libstore/{unix => }/include/nix/store/build/derivation-builder.hh (98%)

diff --git a/src/libstore/unix/include/nix/store/build/derivation-builder.hh b/src/libstore/include/nix/store/build/derivation-builder.hh
similarity index 98%
rename from src/libstore/unix/include/nix/store/build/derivation-builder.hh
rename to src/libstore/include/nix/store/build/derivation-builder.hh
index 1d9b44163..462352c76 100644
--- a/src/libstore/unix/include/nix/store/build/derivation-builder.hh
+++ b/src/libstore/include/nix/store/build/derivation-builder.hh
@@ -188,7 +188,9 @@ struct DerivationBuilder : RestrictionContext
     virtual void killSandbox(bool getStats) = 0;
 };
 
+#ifndef _WIN32 // TODO enable `DerivationBuilder` on Windows
 std::unique_ptr<DerivationBuilder> makeDerivationBuilder(
     LocalStore & store, std::unique_ptr<DerivationBuilderCallbacks> miscMethods, DerivationBuilderParams params);
+#endif
 
 } // namespace nix
diff --git a/src/libstore/include/nix/store/meson.build b/src/libstore/include/nix/store/meson.build
index e41a7da4d..cba5d9ca5 100644
--- a/src/libstore/include/nix/store/meson.build
+++ b/src/libstore/include/nix/store/meson.build
@@ -12,6 +12,7 @@ config_pub_h = configure_file(
 headers = [ config_pub_h ] + files(
   'binary-cache-store.hh',
   'build-result.hh',
+  'build/derivation-builder.hh',
   'build/derivation-building-goal.hh',
   'build/derivation-building-misc.hh',
   'build/derivation-goal.hh',
diff --git a/src/libstore/unix/include/nix/store/meson.build b/src/libstore/unix/include/nix/store/meson.build
index 7cf973223..bdc4b2f20 100644
--- a/src/libstore/unix/include/nix/store/meson.build
+++ b/src/libstore/unix/include/nix/store/meson.build
@@ -2,7 +2,6 @@ include_dirs += include_directories('../..')
 
 headers += files(
   'build/child.hh',
-  'build/derivation-builder.hh',
   'build/hook-instance.hh',
   'user-lock.hh',
 )