pyrox.dev
fork
Configure Feed
Select the types of activity you want to include in your feed.
lol
fork
Configure Feed
Select the types of activity you want to include in your feed.
xar: fix Linux build on staging-next
+53
-1
+5
-1
pkgs/by-name/xa/xar/package.nix
+5
-1
pkgs/by-name/xa/xar/package.nix
···
48
48
# # …
49
49
# rm -r ../pkgs/by-name/xa/xar/patches
50
50
# git format-patch --zero-commit --output-directory ../pkgs/by-name/xa/xar/patches main
51
-
patches = lib.filesystem.listFilesRecursive ./patches;
51
+
patches =
52
+
# Avoid Darwin rebuilds on staging-next
53
+
lib.filter (
54
+
p: stdenv.hostPlatform.isDarwin -> baseNameOf p != "0020-Fall-back-to-readlink-on-Linux.patch"
55
+
) (lib.filesystem.listFilesRecursive ./patches);
52
56
53
57
# We do not use or modify files outside of the xar subdirectory.
54
58
patchFlags = [ "-p2" ];
+48
pkgs/by-name/xa/xar/patches/0020-Fall-back-to-readlink-on-Linux.patch
+48
pkgs/by-name/xa/xar/patches/0020-Fall-back-to-readlink-on-Linux.patch
···
1
+
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
2
+
From: Randy Eckenrode <randy@largeandhighquality.com>
3
+
Date: Wed, 30 Oct 2024 20:19:20 -0400
4
+
Subject: [PATCH 20/20] Fall back to readlink on Linux
5
+
6
+
---
7
+
xar/lib/archive.c | 21 +++++++++++++++++++++
8
+
1 file changed, 21 insertions(+)
9
+
10
+
diff --git a/xar/lib/archive.c b/xar/lib/archive.c
11
+
index b7f9cbf..3a79c74 100644
12
+
--- a/xar/lib/archive.c
13
+
+++ b/xar/lib/archive.c
14
+
@@ -507,10 +507,31 @@ xar_t xar_fdopen_digest_verify(int fd, int32_t flags, void *expected_toc_digest,
15
+
// If there are hardlinks, the path we pick is the most recently opened by
16
+
// the filesystem; which is effectively random.
17
+
char path_buff[PATH_MAX];
18
+
+#if defined(__APPLE__)
19
+
if (fcntl(fd, F_GETPATH, path_buff) < 0) {
20
+
close(fd);
21
+
return NULL;
22
+
}
23
+
+#elif defined(__linux__)
24
+
+ // Linux has to get the path to the file via `/proc`.
25
+
+ char proc_buff[PATH_MAX];
26
+
+ if (snprintf(proc_buff, PATH_MAX, "/proc/self/fd/%i", fd) < 0) {
27
+
+ close(fd);
28
+
+ return NULL;
29
+
+ }
30
+
+ if (readlink(proc_buff, &path_buff, PATH_MAX) < 0) {
31
+
+ close(fd);
32
+
+ return NULL;
33
+
+ }
34
+
+ // The filename is the file’s when the fd was created. Check to make sure it still exists.
35
+
+ struct stat stat_buff;
36
+
+ if (stat(path_buff, &stat_buff) < 0) {
37
+
+ close(fd);
38
+
+ return NULL;
39
+
+ }
40
+
+#else
41
+
+#error "Unknown platform. Please update with an implementation of `F_GETPATH`."
42
+
+#endif
43
+
44
+
// Don't trust the position of the descriptor we were given, reset it back to 0
45
+
if (lseek(fd, 0, SEEK_SET) != 0) {
46
+
--
47
+
2.47.0
48
+