Unverified Commit eef54766 authored by Dominik Honnef's avatar Dominik Honnef Committed by Sandro Jäckel
Browse files

nut: add support for SNMP and CGI

parent 552efeba

pkgs/applications/misc/nut/default.nix

+4 −3
Original line number Diff line number Diff line
@@ -5,12 +5,14 @@ 
, coreutils

, fetchurl

, freeipmi

, gd

, i2c-tools

, libmodbus

, libtool

, libusb-compat-0_1

, makeWrapper

, neon

, net-snmp

, openssl

, pkg-config

, substituteAll
@@ -35,19 +37,18 @@ stdenv.mkDerivation rec { 
      libusb = "${libusb-compat-0_1}/lib";

      neon = "${neon}/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 ];



  configureFlags =

    [ "--with-all"

      "--with-ssl"

      "--without-snmp" # Until we have it ...

      "--without-powerman" # Until we have it ...

      "--without-cgi"

      "--with-systemdsystemunitdir=$(out)/lib/systemd/system"

      "--with-systemdshutdowndir=$(out)/lib/systemd/system-shutdown"

      "--with-systemdtmpfilesdir=$(out)/lib/tmpfiles.d"

pkgs/applications/misc/nut/hardcode-paths.patch

+2 −1
Original line number Diff line number Diff line 
--- a/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.

  */

 static const char * search_paths[] = {
@@ -9,6 +9,7 @@ 
+	"@libusb@",

+	"@neon@",

+	"@libmodbus@",

+	"@netsnmp@",

 	/* Use the library path (and bitness) provided during ./configure first */

 	LIBDIR,

 	"/usr"LIBDIR,