nut: add support for SNMP and CGI

This commit is contained in:
Dominik Honnef 2023-05-20 15:42:49 +02:00 committed by Sandro Jäckel
parent 552efeba59
commit eef5476659
No known key found for this signature in database
GPG Key ID: 3AF5A43A3EECC2E5
2 changed files with 6 additions and 4 deletions

View File

@ -5,12 +5,14 @@
, coreutils , coreutils
, fetchurl , fetchurl
, freeipmi , freeipmi
, gd
, i2c-tools , i2c-tools
, libmodbus , libmodbus
, libtool , libtool
, libusb-compat-0_1 , libusb-compat-0_1
, makeWrapper , makeWrapper
, neon , neon
, net-snmp
, openssl , openssl
, pkg-config , pkg-config
, substituteAll , substituteAll
@ -35,19 +37,18 @@ stdenv.mkDerivation rec {
libusb = "${libusb-compat-0_1}/lib"; libusb = "${libusb-compat-0_1}/lib";
neon = "${neon}/lib"; neon = "${neon}/lib";
libmodbus = "${libmodbus}/lib"; libmodbus = "${libmodbus}/lib";
netsnmp = "${net-snmp.lib}/lib";
}) })
]; ];
buildInputs = [ neon libusb-compat-0_1 openssl udev avahi freeipmi libmodbus i2c-tools ]; buildInputs = [ neon libusb-compat-0_1 openssl udev avahi freeipmi libmodbus i2c-tools net-snmp gd ];
nativeBuildInputs = [ autoreconfHook libtool pkg-config makeWrapper ]; nativeBuildInputs = [ autoreconfHook libtool pkg-config makeWrapper ];
configureFlags = configureFlags =
[ "--with-all" [ "--with-all"
"--with-ssl" "--with-ssl"
"--without-snmp" # Until we have it ...
"--without-powerman" # Until we have it ... "--without-powerman" # Until we have it ...
"--without-cgi"
"--with-systemdsystemunitdir=$(out)/lib/systemd/system" "--with-systemdsystemunitdir=$(out)/lib/systemd/system"
"--with-systemdshutdowndir=$(out)/lib/systemd/system-shutdown" "--with-systemdshutdowndir=$(out)/lib/systemd/system-shutdown"
"--with-systemdtmpfilesdir=$(out)/lib/tmpfiles.d" "--with-systemdtmpfilesdir=$(out)/lib/tmpfiles.d"

View File

@ -1,6 +1,6 @@
--- a/common/common.c --- a/common/common.c
+++ b/common/common.c +++ b/common/common.c
@@ -991,6 +991,11 @@ ssize_t select_write(const int fd, const void *buf, const size_t buflen, const t @@ -991,6 +991,12 @@ ssize_t select_write(const int fd, const void *buf, const size_t buflen, const t
* communications media and/or vendor protocol. * communications media and/or vendor protocol.
*/ */
static const char * search_paths[] = { static const char * search_paths[] = {
@ -9,6 +9,7 @@
+ "@libusb@", + "@libusb@",
+ "@neon@", + "@neon@",
+ "@libmodbus@", + "@libmodbus@",
+ "@netsnmp@",
/* Use the library path (and bitness) provided during ./configure first */ /* Use the library path (and bitness) provided during ./configure first */
LIBDIR, LIBDIR,
"/usr"LIBDIR, "/usr"LIBDIR,