wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-07-07 10:11:47 +02:00
Code Activity

Merge pull request #9491 from obsidiansystems/fix-freebsd

Browse source 
Improve ACL clearing support (fixing FreeBSD build)
This commit is contained in:
Eelco Dolstra 2023-11-30 15:27:24 +01:00 • committed by GitHub
commit eac0a62052
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/libstore/local-store.cc
View file

@ -34,7 +34,6 @@
#include <sys/statvfs.h>
#include <sys/mount.h>
#include <sys/ioctl.h>
#include <sys/xattr.h>
#endif
#ifdef __CYGWIN__

6
src/libstore/posix-fs-canonicalise.cc
View file

@ -1,4 +1,6 @@
#include <sys/xattr.h>
#if HAVE_SYS_XATTR_H
# include <sys/xattr.h>
#endif
#include "posix-fs-canonicalise.hh"
#include "file-system.hh"
@ -76,7 +78,7 @@ static void canonicalisePathMetaData_(
if (!(S_ISREG(st.st_mode) || S_ISDIR(st.st_mode) || S_ISLNK(st.st_mode)))
throw Error("file '%1%' has an unsupported type", path);
#if __linux__
#ifdef HAVE_SYS_XATTR_H
/* Remove extended attributes / ACLs. */
ssize_t eaSize = llistxattr(path.c_str(), nullptr, 0);