nut: add support for SNMP and CGI

authored by

Dominik Honnef and committed by
Sandro Jäckel
eef54766 552efeba

+6 -4
+4 -3
pkgs/applications/misc/nut/default.nix
··· 5 , coreutils 6 , fetchurl 7 , freeipmi 8 , i2c-tools 9 , libmodbus 10 , libtool 11 , libusb-compat-0_1 12 , makeWrapper 13 , neon 14 , openssl 15 , pkg-config 16 , substituteAll ··· 35 libusb = "${libusb-compat-0_1}/lib"; 36 neon = "${neon}/lib"; 37 libmodbus = "${libmodbus}/lib"; 38 }) 39 ]; 40 41 - buildInputs = [ neon libusb-compat-0_1 openssl udev avahi freeipmi libmodbus i2c-tools ]; 42 43 nativeBuildInputs = [ autoreconfHook libtool pkg-config makeWrapper ]; 44 45 configureFlags = 46 [ "--with-all" 47 "--with-ssl" 48 - "--without-snmp" # Until we have it ... 49 "--without-powerman" # Until we have it ... 50 - "--without-cgi" 51 "--with-systemdsystemunitdir=$(out)/lib/systemd/system" 52 "--with-systemdshutdowndir=$(out)/lib/systemd/system-shutdown" 53 "--with-systemdtmpfilesdir=$(out)/lib/tmpfiles.d"
··· 5 , coreutils 6 , fetchurl 7 , freeipmi 8 + , gd 9 , i2c-tools 10 , libmodbus 11 , libtool 12 , libusb-compat-0_1 13 , makeWrapper 14 , neon 15 + , net-snmp 16 , openssl 17 , pkg-config 18 , substituteAll ··· 37 libusb = "${libusb-compat-0_1}/lib"; 38 neon = "${neon}/lib"; 39 libmodbus = "${libmodbus}/lib"; 40 + netsnmp = "${net-snmp.lib}/lib"; 41 }) 42 ]; 43 44 + buildInputs = [ neon libusb-compat-0_1 openssl udev avahi freeipmi libmodbus i2c-tools net-snmp gd ]; 45 46 nativeBuildInputs = [ autoreconfHook libtool pkg-config makeWrapper ]; 47 48 configureFlags = 49 [ "--with-all" 50 "--with-ssl" 51 "--without-powerman" # Until we have it ... 52 "--with-systemdsystemunitdir=$(out)/lib/systemd/system" 53 "--with-systemdshutdowndir=$(out)/lib/systemd/system-shutdown" 54 "--with-systemdtmpfilesdir=$(out)/lib/tmpfiles.d"
+2 -1
pkgs/applications/misc/nut/hardcode-paths.patch
··· 1 --- a/common/common.c 2 +++ b/common/common.c 3 - @@ -991,6 +991,11 @@ ssize_t select_write(const int fd, const void *buf, const size_t buflen, const t 4 * communications media and/or vendor protocol. 5 */ 6 static const char * search_paths[] = { ··· 9 + "@libusb@", 10 + "@neon@", 11 + "@libmodbus@", 12 /* Use the library path (and bitness) provided during ./configure first */ 13 LIBDIR, 14 "/usr"LIBDIR,
··· 1 --- a/common/common.c 2 +++ b/common/common.c 3 + @@ -991,6 +991,12 @@ ssize_t select_write(const int fd, const void *buf, const size_t buflen, const t 4 * communications media and/or vendor protocol. 5 */ 6 static const char * search_paths[] = { ··· 9 + "@libusb@", 10 + "@neon@", 11 + "@libmodbus@", 12 + + "@netsnmp@", 13 /* Use the library path (and bitness) provided during ./configure first */ 14 LIBDIR, 15 "/usr"LIBDIR,