Merge pull request #12964 from NixOS/mergify/bp/2.28-maintenance/pr-12959

Keep fchmodat2-compat.hh private (backport #12959)
2025-06-25 10:41:16 +02:00 · 2025-04-07 20:32:05 +00:00 · 2025-04-07 20:32:05 +00:00 · 467a1df842
commit 467a1df842
parent 3a758fc348 aa1c690ebf
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
@ -42,7 +42,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>