apteryx pushed a commit to branch master
in repository guix.
commit 05f08c11ff9b19716dc1a7d0129eb4c2c041a275
Author: nathan <[email protected]>
AuthorDate: Mon Jul 10 23:22:48 2023 -0400
gnu: libusb-compat: Specify the absolute file name for libusb.
Refine the fix for loading libusb correctly.
* gnu/packages/libusb.scm (libusb) [arguments]
<configure-flags>: New LIBUSB_1_0_SONAME flag.
Modified-by: Maxim Cournoyer <[email protected]>
---
gnu/packages/libusb.scm | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/gnu/packages/libusb.scm b/gnu/packages/libusb.scm
index 1d514c11b7..e615b81ea3 100644
--- a/gnu/packages/libusb.scm
+++ b/gnu/packages/libusb.scm
@@ -103,14 +103,13 @@ devices on various operating systems.")
(arguments
(list #:configure-flags
#~(list "--disable-static"
- ;; Extending the RUNPATH is necessary, otherwise loading
- ;; the libusb-1.0.so.0 library fails.
- (string-append "LDFLAGS=-Wl,-rpath="
- #$(this-package-input "libusb") "/lib"))))
- (native-inputs
- (list autoconf automake libtool pkg-config))
- (inputs
- (list libusb))
+ ;; Provide the absolute file name of libusb-1.0.so so
+ ;; dlopen works.
+ (string-append "LIBUSB_1_0_SONAME="
+ #$(this-package-input "libusb")
+ "/lib/libusb-1.0.so"))))
+ (native-inputs (list autoconf automake libtool pkg-config))
+ (inputs (list libusb))
(home-page "https://libusb.info";)
(synopsis "Compatibility shim for libusb")
(description
