nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: open-zwave: Use the bundled TinyXML. 

* gnu/packages/zwave.scm (open-zwave)[source](snippet): Remove code to
use our own TinyXML.
[inputs]: Remove TINYXML.
This commit is contained in:
Ludovic Courtès 2019-07-15 18:24:10 +02:00
parent 6f8eb9f1d8
commit e8fc56a3d2
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gnu/packages/zwave.scm
View File

@ -51,11 +51,9 @@
(("\\$\\(LDFLAGS\\)") (("\\$\\(LDFLAGS\\)")
"$(LDFLAGS) -Wl,-rpath=$(PREFIX)/lib")) "$(LDFLAGS) -Wl,-rpath=$(PREFIX)/lib"))
;; Delete the bundled TinyXML. ;; XXX: There's a bundled TinyXML under cpp/tinyxml. Keep
(delete-file-recursively "cpp/tinyxml") ;; it because using our own TinyXML leads to double-free
(substitute* "cpp/build/Makefile" ;; down the road.
(("LIBS \\+= -ludev")
"LIBS += -ludev -ltinyxml "))
;; Delete the bundled HIDAPI. ;; Delete the bundled HIDAPI.
(delete-file-recursively "cpp/hidapi") (delete-file-recursively "cpp/hidapi")
@ -80,8 +78,7 @@
("pkg-config" ,pkg-config) ("pkg-config" ,pkg-config)
("perl" ,perl) ;for tests ("perl" ,perl) ;for tests
("perl-xml-simple" ,perl-xml-simple))) ("perl-xml-simple" ,perl-xml-simple)))
(inputs `(("tinyxml" ,tinyxml) (inputs `(("hidapi" ,hidapi)
("hidapi" ,hidapi)
("eudev" ,eudev))) ("eudev" ,eudev)))
(home-page "http://www.openzwave.net/") (home-page "http://www.openzwave.net/")
(synopsis "Access Z-Wave devices from C++ programs") (synopsis "Access Z-Wave devices from C++ programs")