pyrox.dev
Merge pull request #186002 from Majiir/nut-scanner-fix
Fixes https://github.com/NixOS/nixpkgs/issues/91730
+8
-6
pkgs/applications/misc/nut/default.nix
+8
-6
pkgs/applications/misc/nut/default.nix
···
1
-
{ lib, stdenv, fetchurl, pkg-config, neon, libusb-compat-0_1, openssl, udev, avahi, freeipmi
1
+
{ lib, stdenv, fetchurl, substituteAll, pkg-config, neon, libusb-compat-0_1, openssl, udev, avahi, freeipmi
2
2
, libtool, makeWrapper, autoreconfHook, fetchpatch
3
3
}:
4
4
···
17
17
url = "https://github.com/networkupstools/nut/commit/612c05efb3c3b243da603a3a050993281888b6e3.patch";
18
18
sha256 = "0jdbii1z5sqyv24286j5px65j7b3gp8zk3ahbph83pig6g46m3hs";
19
19
})
20
+
(substituteAll {
21
+
src = ./hardcode-paths.patch;
22
+
avahi = "${avahi}/lib";
23
+
freeipmi = "${freeipmi}/lib";
24
+
libusb = "${libusb-compat-0_1}/lib";
25
+
neon = "${neon}/lib";
26
+
})
20
27
];
21
28
22
29
buildInputs = [ neon libusb-compat-0_1 openssl udev avahi freeipmi ];
···
37
44
enableParallelBuilding = true;
38
45
39
46
NIX_CFLAGS_COMPILE = [ "-std=c++14" ];
40
-
41
-
postInstall = ''
42
-
wrapProgram $out/bin/nut-scanner --prefix LD_LIBRARY_PATH : \
43
-
"$out/lib:${neon}/lib:${libusb-compat-0_1.out}/lib:${avahi}/lib:${freeipmi}/lib"
44
-
'';
45
47
46
48
meta = with lib; {
47
49
description = "Network UPS Tools";
+13
pkgs/applications/misc/nut/hardcode-paths.patch
+13
pkgs/applications/misc/nut/hardcode-paths.patch
···
1
+
--- a/tools/nut-scanner/nutscan-init.c
2
+
+++ b/tools/nut-scanner/nutscan-init.c
3
+
@@ -44,6 +44,10 @@ int nutscan_load_upsclient_library(const char *libname_path);
4
+
5
+
/* FIXME: would be good to get more from /etc/ld.so.conf[.d] */
6
+
char * search_paths[] = {
7
+
+ "@avahi@",
8
+
+ "@freeipmi@",
9
+
+ "@libusb@",
10
+
+ "@neon@",
11
+
LIBDIR,
12
+
"/usr/lib64",
13
+
"/lib64",