diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2019-06-20 23:38:56 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2019-06-20 23:38:56 +0200 |
| commit | 6cb1ef9ea28ee14b3bb5442e8af1f54c27802f09 (patch) | |
| tree | c2c35f733d250f86eb052d174fcb1c24a54fea79 /gnu/packages/zwave.scm | |
| parent | 20e4ee1e3b7044d9f64de02c6237b00e5a57da35 (diff) | |
| parent | 010689e7067df1288af29176f4a8639de816b1ef (diff) | |
| download | guix-patches-6cb1ef9ea28ee14b3bb5442e8af1f54c27802f09.tar guix-patches-6cb1ef9ea28ee14b3bb5442e8af1f54c27802f09.tar.gz | |
Merge branch 'staging' into core-updates
Diffstat (limited to 'gnu/packages/zwave.scm')
| -rw-r--r-- | gnu/packages/zwave.scm | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/gnu/packages/zwave.scm b/gnu/packages/zwave.scm index 43d1747332..f07367d264 100644 --- a/gnu/packages/zwave.scm +++ b/gnu/packages/zwave.scm @@ -21,9 +21,12 @@ #:use-module ((guix licenses) #:prefix license:) #:use-module (guix git-download) #:use-module (guix build-system gnu) + #:use-module (gnu packages) #:use-module (gnu packages base) + #:use-module (gnu packages libusb) #:use-module (gnu packages linux) #:use-module (gnu packages perl) + #:use-module (gnu packages pkg-config) #:use-module (gnu packages xml)) (define-public open-zwave @@ -39,6 +42,7 @@ (sha256 (base32 "0xgs4mmr0480c269wx9xkk67ikjzxkh8xcssrdx0f5xcl1lyd333")) + (patches (search-patches "open-zwave-hidapi.patch")) (modules '((guix build utils))) (snippet '(begin @@ -52,6 +56,9 @@ (substitute* "cpp/build/Makefile" (("LIBS \\+= -ludev") "LIBS += -ludev -ltinyxml ")) + + ;; Delete the bundled HIDAPI. + (delete-file-recursively "cpp/hidapi") #t)))) (build-system gnu-build-system) (arguments @@ -70,9 +77,11 @@ ;; them. #:tests? #f)) (native-inputs `(("which" ,which) + ("pkg-config" ,pkg-config) ("perl" ,perl) ;for tests ("perl-xml-simple" ,perl-xml-simple))) (inputs `(("tinyxml" ,tinyxml) + ("hidapi" ,hidapi) ("eudev" ,eudev))) (home-page "http://www.openzwave.net/") (synopsis "Access Z-Wave devices from C++ programs") |