Merge pull request #135937 from SuperSandro2000/openipmi

authored by

Sandro and committed by
GitHub
9b3a91bc d90b2fc2

+17
+6
pkgs/tools/system/openipmi/default.nix
··· 9 9 sha256 = "05wpkn74nxqp5p6sa2yaf2ajrh8b0gfkb7y4r86lnigz4rvz6lkh"; 10 10 }; 11 11 12 + patches = [ 13 + # fix assertion when used as a library in collectd 14 + # taken from https://sourceforge.net/p/openipmi/code/ci/d613d279dbce2d5e4594f6fed39653d83af0d99b/ 15 + ./fix-collectd-assertion.diff 16 + ]; 17 + 12 18 buildInputs = [ ncurses popt python3 readline ]; 13 19 14 20 outputs = [ "out" "lib" "dev" "man" ];
+11
pkgs/tools/system/openipmi/fix-collectd-assertion.diff
··· 1 + --- a/unix/posix_thread_os_hnd.c 2 + +++ b/unix/posix_thread_os_hnd.c 3 + @@ -140,8 +140,6 @@ 4 + fd_data->data_ready = data_ready; 5 + fd_data->handler = handler; 6 + fd_data->freed = freed; 7 + - sel_set_fd_write_handler(posix_sel, fd, SEL_FD_HANDLER_DISABLED); 8 + - sel_set_fd_except_handler(posix_sel, fd, SEL_FD_HANDLER_DISABLED); 9 + rv = sel_set_fd_handlers(posix_sel, fd, fd_data, fd_handler, NULL, NULL, 10 + free_fd_data); 11 + if (rv) {