Merge pull request #12959 from DeterminateSystems/fchmodat2-compat-private

Keep fchmodat2-compat.hh private
2025-04-07 15:17:46 -04:00
parent 856f8e0e49 04e9dc27ac
commit 3bcc70b64f
3 changed files with 1 additions and 2 deletions
--- a/src/libstore/linux/include/nix/store/fchmodat2-compat.hh
+++ b/src/libstore/linux/include/nix/store/fchmodat2-compat.hh
--- 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',
 )
--- 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>