From eea31494c11c3dcd88868b7530c45edd08cf7cf2 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Costa Date: Sun, 12 Oct 2025 00:40:11 +0000 Subject: [PATCH] fix(libstore/find-cycles): install header in public include directory Move `find-cycles.hh` to `src/libstore/include/nix/store/build/` to ensure it is properly installed as a public header and can be used by tests and other consumers of the library. --- src/libstore/build/find-cycles.cc | 2 +- src/libstore/{ => include/nix/store}/build/find-cycles.hh | 0 src/libstore/include/nix/store/meson.build | 1 + src/libstore/unix/build/derivation-builder.cc | 2 +- 4 files changed, 3 insertions(+), 2 deletions(-) rename src/libstore/{ => include/nix/store}/build/find-cycles.hh (100%) diff --git a/src/libstore/build/find-cycles.cc b/src/libstore/build/find-cycles.cc index 0c1f5ee41..3ade944f4 100644 --- a/src/libstore/build/find-cycles.cc +++ b/src/libstore/build/find-cycles.cc @@ -1,4 +1,4 @@ -#include "find-cycles.hh" +#include "nix/store/build/find-cycles.hh" #include "nix/store/store-api.hh" #include "nix/util/file-system.hh" diff --git a/src/libstore/build/find-cycles.hh b/src/libstore/include/nix/store/build/find-cycles.hh similarity index 100% rename from src/libstore/build/find-cycles.hh rename to src/libstore/include/nix/store/build/find-cycles.hh diff --git a/src/libstore/include/nix/store/meson.build b/src/libstore/include/nix/store/meson.build index 5d6626ff8..5549a192a 100644 --- a/src/libstore/include/nix/store/meson.build +++ b/src/libstore/include/nix/store/meson.build @@ -21,6 +21,7 @@ headers = [ config_pub_h ] + files( 'build/derivation-resolution-goal.hh', 'build/derivation-trampoline-goal.hh', 'build/drv-output-substitution-goal.hh', + 'build/find-cycles.hh', 'build/goal.hh', 'build/substitution-goal.hh', 'build/worker.hh', diff --git a/src/libstore/unix/build/derivation-builder.cc b/src/libstore/unix/build/derivation-builder.cc index bd00b7701..e650d6fdd 100644 --- a/src/libstore/unix/build/derivation-builder.cc +++ b/src/libstore/unix/build/derivation-builder.cc @@ -45,7 +45,7 @@ #include "store-config-private.hh" #include "build/derivation-check.hh" -#include "build/find-cycles.hh" +#include "nix/store/build/find-cycles.hh" #if NIX_WITH_AWS_AUTH # include "nix/store/aws-creds.hh"