wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-25 10:41:16 +02:00
Code Activity

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

Browse source 
Keep fchmodat2-compat.hh private (backport #12959)
This commit is contained in:
mergify[bot] 2025-04-07 20:32:05 +00:00 • committed by GitHub
commit 467a1df842
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 1 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

0
src/libstore/linux/include/nix/store/fchmodat2-compat.hh → src/libstore/linux/fchmodat2-compat.hh
View file

1
src/libstore/linux/include/nix/store/meson.build
View file

@ -1,6 +1,5 @@
include_dirs += include_directories('../..') include_dirs += include_directories('../..')
headers += files( headers += files(
'fchmodat2-compat.hh',
'personality.hh', 'personality.hh',
) )

2
src/libstore/unix/build/local-derivation-goal.cc
View file

@ -42,7 +42,7 @@
/* Includes required for chroot support. */ /* Includes required for chroot support. */
#ifdef __linux__ #ifdef __linux__
# include "nix/store/fchmodat2-compat.hh" # include "linux/fchmodat2-compat.hh"
# include <sys/ioctl.h> # include <sys/ioctl.h>
# include <net/if.h> # include <net/if.h>
# include <netinet/ip.h> # include <netinet/ip.h>