summary refs log tree commit diff
path: root/gnu/packages/patches
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2019-06-16 15:22:15 +0200
committerLudovic Courtès <ludo@gnu.org>2019-06-17 12:36:13 +0200
commit123b9c02dddd21b61858fbf01fb356c14f220f21 (patch)
tree9fa411383dd3478417126686396b5681952968d0 /gnu/packages/patches
parentbf95a142bbe8ab4ae6ccf87ad0df21cb56bbd3d3 (diff)
downloadguix-123b9c02dddd21b61858fbf01fb356c14f220f21.tar.gz
gnu: open-zwave: Unbundle hidapi.
* gnu/packages/patches/open-zwave-hidapi.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/zwave.scm (open-zwave)[source](patches): New field.
(snippet): Delete 'cpp/hidapi'.
[native-inputs]: Add PKG-CONFIG.
[inputs]: Add HIDAPI.
Diffstat (limited to 'gnu/packages/patches')
-rw-r--r--gnu/packages/patches/open-zwave-hidapi.patch15
1 files changed, 15 insertions, 0 deletions
diff --git a/gnu/packages/patches/open-zwave-hidapi.patch b/gnu/packages/patches/open-zwave-hidapi.patch
new file mode 100644
index 0000000000..fc50bfeade
--- /dev/null
+++ b/gnu/packages/patches/open-zwave-hidapi.patch
@@ -0,0 +1,15 @@
+Build against the system's HIDAPI instead of the bundled one.
+
+--- open-zwave-1.6-checkout/cpp/build/support.mk	2019-06-16 15:15:34.258331628 +0200
++++ open-zwave-1.6-checkout/cpp/build/support.mk	2019-06-16 15:15:54.698249462 +0200
+@@ -86,6 +86,10 @@ endif
+ endif
+ SED    := sed
+ 
++# Build against the system's HIDAPI.
++CPPFLAGS += $(shell pkg-config hidapi-libusb --cflags)
++LDFLAGS  += $(shell pkg-config hidapi-libusb --libs)
++
+ #determine if we are release or debug Build and set appropriate flags
+ ifeq ($(BUILD), release)
+ CFLAGS	+= -c $(RELEASE_CFLAGS)