nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-01-21 12:23:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

darwin.file_cmds: 264.1.1 -> 448.0.3

Browse Source 
https://github.com/apple-oss-distributions/file_cmds/compare/file_cmds-264.1.1...file_cmds-448.0.3
This commit is contained in:
Randy Eckenrode 2024-09-21 23:39:55 -04:00
parent c640ed88a7
commit 32f5febdc3
No known key found for this signature in database
GPG Key ID: 64C1CD4EC2A600D9
4 changed files with 48 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/os-specific/darwin/apple-source-releases/file_cmds/meson.build.in
View File

@ -3,7 +3,10 @@
# Project settings
project('file_cmds', 'c', version : '@version@')
add_global_arguments(
'-DTARGET_OS_BRIDGE=0',
language : 'c',
)
# Dependencies
cc = meson.get_compiler('c')
@ -210,9 +213,14 @@ install_symlink(
executable(
'install-bin', # Meson reserves the name “install”, so use a different name and rename in install phase.
c_args : utimensat_c_args,
dependencies : [ copyfile ],
install : true,
sources: [ 'install/xinstall.c' ],
link_args : compat_link_args,
sources: [
'install/xinstall.c',
utimensat_sources,
],
)
install_man('install/install.1')

4
pkgs/os-specific/darwin/apple-source-releases/file_cmds/package.nix
View File

@ -101,11 +101,13 @@ mkAppleDerivation {
"xattr"
];
xcodeHash = "sha256-Q5Pw/Tl1Ar47VsoIxR229GabyDcA11sTrLtE/A3k2gg=";
xcodeHash = "sha256-u23AoLa7J0eFtf4dXKkVO59eYL2I3kRsHcWPfT03MCU=";
patches = [
# Fixes build of ls
./patches/0001-Add-missing-extern-unix2003_compat-to-ls.patch
# Add missing conditional to avoid using private APFS APIs that we lack headers for using.
./patches/0002-Add-missing-ifdef-for-private-APFS-APIs.patch
# Add implementations of missing functions for older SDKs
./patches/0003-Add-implementations-of-missing-APIs-for-older-SDKs.patch
];

33
pkgs/os-specific/darwin/apple-source-releases/file_cmds/patches/0002-Add-missing-ifdef-for-private-APFS-APIs.patch Normal file
View File

@ -0,0 +1,33 @@
From c40768a7a0cd4bcc75a408880e79135ad33292b5 Mon Sep 17 00:00:00 2001
From: Randy Eckenrode <randy@largeandhighquality.com>
Date: Sat, 7 Sep 2024 09:44:20 -0400
Subject: [PATCH 2/3] Add missing #ifdef for private APFS APIs
---
mtree/commoncrypto.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/mtree/commoncrypto.c b/mtree/commoncrypto.c
index 75790dd..e04d1c6 100644
--- a/mtree/commoncrypto.c
+++ b/mtree/commoncrypto.c
@@ -254,6 +254,7 @@ get_xdstream_privateid(char *path, char *buf) {
nextName += strlen(name) + 1;
}
+#ifdef APFSIOC_XDSTREAM_OBJ_ID
for (int i = 0; i < xattrIndex; i++) {
char *name = xattrs[i];
// System volume has stream based xattrs only in form of resource forks
@@ -275,7 +276,7 @@ get_xdstream_privateid(char *path, char *buf) {
}
}
}
-
+#endif
ai->xdstream_priv_id = xd_obj_id;
// insert a dummy value as digest is not used in presence of mflag
ai->digest = "authapfs";
--
2.46.0

4
pkgs/os-specific/darwin/apple-source-releases/versions.json
View File

@ -44,8 +44,8 @@
"version": "66"
},
"file_cmds": {
"hash": "sha256-JYy6HwmultKeZtLfaysbsyLoWg+OaTh7eJu54JkJC0Q=",
"version": "264.1.1"
"hash": "sha256-/79jS//IBZiQBumGA60lKDmddQCzl/r8QnviD6lGXNg=",
"version": "448.0.3"
},
"libiconv": {
"hash": "sha256-TGt6rsU52ztfW2rCqwnhMAExLbexI/59IoDOGY+XGu0=",