From a2b8dba362810c9312b65fa2eeb351d66003fd01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Wed, 21 Aug 2024 23:06:23 +0200 Subject: [PATCH] nut: enable the GPIO driver NUT wants to build it by default, so allow it. It works with libgpiod_1, not libgpiod. The closure size increases from 365 MiB to 366 MiB. --- pkgs/applications/misc/nut/default.nix | 5 +++-- pkgs/applications/misc/nut/hardcode-paths.patch | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/nut/default.nix b/pkgs/applications/misc/nut/default.nix index b2ed55eb16ca..cded819dbb5b 100644 --- a/pkgs/applications/misc/nut/default.nix +++ b/pkgs/applications/misc/nut/default.nix @@ -7,6 +7,7 @@ , freeipmi , gd , i2c-tools +, libgpiod_1 , libmodbus , libtool , libusb1 @@ -42,6 +43,7 @@ stdenv.mkDerivation rec { src = ./hardcode-paths.patch; avahi = "${avahi}/lib"; freeipmi = "${freeipmi}/lib"; + libgpiod = "${libgpiod_1}/lib"; libusb = "${libusb1}/lib"; neon = "${neon}/lib"; libmodbus = "${libmodbus}/lib"; @@ -49,14 +51,13 @@ stdenv.mkDerivation rec { }) ]; - buildInputs = [ neon libusb1 openssl udev avahi freeipmi libmodbus libtool i2c-tools net-snmp gd ]; + buildInputs = [ neon libusb1 openssl udev avahi freeipmi libgpiod_1 libmodbus libtool i2c-tools net-snmp gd ]; nativeBuildInputs = [ autoreconfHook pkg-config makeWrapper ]; configureFlags = [ "--with-all" "--with-ssl" - "--without-gpio" "--without-powerman" # Until we have it ... "--with-systemdsystemunitdir=$(out)/lib/systemd/system" "--with-systemdshutdowndir=$(out)/lib/systemd/system-shutdown" diff --git a/pkgs/applications/misc/nut/hardcode-paths.patch b/pkgs/applications/misc/nut/hardcode-paths.patch index b2d0a55fb56a..2a85644358c9 100644 --- a/pkgs/applications/misc/nut/hardcode-paths.patch +++ b/pkgs/applications/misc/nut/hardcode-paths.patch @@ -1,11 +1,12 @@ --- a/common/common.c +++ b/common/common.c -@@ -1990,6 +1990,12 @@ ssize_t select_write(serial_handler_t *fd, const void *buf, const size_t buflen, +@@ -1990,6 +1990,13 @@ ssize_t select_write(serial_handler_t *fd, const void *buf, const size_t buflen, * communications media and/or vendor protocol. */ static const char * search_paths_builtin[] = { + "@avahi@", + "@freeipmi@", ++ "@libgpiod@", + "@libusb@", + "@neon@", + "@libmodbus@",