diff --git a/pkgs/os-specific/linux/dmraid/default.nix b/pkgs/os-specific/linux/dmraid/default.nix index ab366ad88ad5..78ccf00831e4 100644 --- a/pkgs/os-specific/linux/dmraid/default.nix +++ b/pkgs/os-specific/linux/dmraid/default.nix @@ -16,7 +16,10 @@ stdenv.mkDerivation rec { }; patches = - [ ./hardening-format.patch ] + [ + ./hardening-format.patch + ./fix-dmevent_tool.patch + ] ++ lib.optionals stdenv.hostPlatform.isMusl [ (fetchpatch { url = "https://raw.githubusercontent.com/void-linux/void-packages/fceed4b8e96b3c1da07babf6f67b6ed1588a28b2/srcpkgs/dmraid/patches/006-musl-libc.patch"; diff --git a/pkgs/os-specific/linux/dmraid/fix-dmevent_tool.patch b/pkgs/os-specific/linux/dmraid/fix-dmevent_tool.patch new file mode 100644 index 000000000000..b7ef83cfa9b3 --- /dev/null +++ b/pkgs/os-specific/linux/dmraid/fix-dmevent_tool.patch @@ -0,0 +1,20 @@ +--- a/1.0.0.rc16/tools/dmevent_tool.c.old 2024-12-26 18:39:04.294039876 -0700 ++++ a/1.0.0.rc16/tools/dmevent_tool.c 2024-12-26 18:45:59.416784807 -0700 +@@ -123,7 +123,7 @@ + } + + /* Increment option counters. */ +-static _process_opt(int opt, const char *cmd) ++static int _process_opt(int opt, const char *cmd) + { + struct opt_def_struct { + const char opt; /* Option character. */ +@@ -148,7 +148,7 @@ + + optc[o->type]++; + optc[OPT_SUM]++; +- return; ++ return 0; + } + } +