From 04e9dc27ac6a0ebcb4163581a208aeb9837164c3 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Mon, 7 Apr 2025 18:10:03 +0200
Subject: [PATCH] Keep fchmodat2-compat.hh private

Since it references store-config-private.hh.
---
 src/libstore/linux/{include/nix/store => }/fchmodat2-compat.hh | 0
 src/libstore/linux/include/nix/store/meson.build               | 1 -
 src/libstore/unix/build/local-derivation-goal.cc               | 2 +-
 3 files changed, 1 insertion(+), 2 deletions(-)
 rename src/libstore/linux/{include/nix/store => }/fchmodat2-compat.hh (100%)

diff --git a/src/libstore/linux/include/nix/store/fchmodat2-compat.hh b/src/libstore/linux/fchmodat2-compat.hh
similarity index 100%
rename from src/libstore/linux/include/nix/store/fchmodat2-compat.hh
rename to src/libstore/linux/fchmodat2-compat.hh
diff --git a/src/libstore/linux/include/nix/store/meson.build b/src/libstore/linux/include/nix/store/meson.build
index fd05fcaea..a664aefa9 100644
--- a/src/libstore/linux/include/nix/store/meson.build
+++ b/src/libstore/linux/include/nix/store/meson.build
@@ -1,6 +1,5 @@
 include_dirs += include_directories('../..')
 
 headers += files(
-  'fchmodat2-compat.hh',
   'personality.hh',
 )
diff --git a/src/libstore/unix/build/local-derivation-goal.cc b/src/libstore/unix/build/local-derivation-goal.cc
index 892513ea8..8adc001f0 100644
--- a/src/libstore/unix/build/local-derivation-goal.cc
+++ b/src/libstore/unix/build/local-derivation-goal.cc
@@ -43,7 +43,7 @@
 
 /* Includes required for chroot support. */
 #ifdef __linux__
-# include "nix/store/fchmodat2-compat.hh"
+# include "linux/fchmodat2-compat.hh"
 # include <sys/ioctl.h>
 # include <net/if.h>
 # include <netinet/ip.h>