pyrox.dev
dmraid: patch dmevent_tool.c to compile on modern gcc versions (#368470)
+4
-1
pkgs/os-specific/linux/dmraid/default.nix
+4
-1
pkgs/os-specific/linux/dmraid/default.nix
···
16
16
};
17
17
18
18
patches =
19
-
[ ./hardening-format.patch ]
19
+
[
20
+
./hardening-format.patch
21
+
./fix-dmevent_tool.patch
22
+
]
20
23
++ lib.optionals stdenv.hostPlatform.isMusl [
21
24
(fetchpatch {
22
25
url = "https://raw.githubusercontent.com/void-linux/void-packages/fceed4b8e96b3c1da07babf6f67b6ed1588a28b2/srcpkgs/dmraid/patches/006-musl-libc.patch";
+20
pkgs/os-specific/linux/dmraid/fix-dmevent_tool.patch
+20
pkgs/os-specific/linux/dmraid/fix-dmevent_tool.patch
···
1
+
--- a/1.0.0.rc16/tools/dmevent_tool.c.old 2024-12-26 18:39:04.294039876 -0700
2
+
+++ a/1.0.0.rc16/tools/dmevent_tool.c 2024-12-26 18:45:59.416784807 -0700
3
+
@@ -123,7 +123,7 @@
4
+
}
5
+
6
+
/* Increment option counters. */
7
+
-static _process_opt(int opt, const char *cmd)
8
+
+static int _process_opt(int opt, const char *cmd)
9
+
{
10
+
struct opt_def_struct {
11
+
const char opt; /* Option character. */
12
+
@@ -148,7 +148,7 @@
13
+
14
+
optc[o->type]++;
15
+
optc[OPT_SUM]++;
16
+
- return;
17
+
+ return 0;
18
+
}
19
+
}
20
+