HCoop
/
jackhill
/
guix
/
guix.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
gnu: Add libwhich.
[jackhill/guix/guix.git]
/
gnu
/
packages
/
lighting.scm
diff --git
a/gnu/packages/lighting.scm
b/gnu/packages/lighting.scm
index
e70b276
..
1811042
100644
(file)
--- a/
gnu/packages/lighting.scm
+++ b/
gnu/packages/lighting.scm
@@
-1,5
+1,6
@@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2016 John J. Foerch <jjfoerch@earthlink.net>
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2016 John J. Foerch <jjfoerch@earthlink.net>
+;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;;
;;; This file is part of GNU Guix.
;;;
;;;
;;; This file is part of GNU Guix.
;;;
@@
-36,7
+37,7
@@
(define-public ola
(package
(name "ola")
(define-public ola
(package
(name "ola")
- (version "0.10.
2
")
+ (version "0.10.
7
")
(source (origin
(method url-fetch)
(uri (string-append
(source (origin
(method url-fetch)
(uri (string-append
@@
-45,7
+46,7
@@
(patches (search-patches "ola-readdir-r.patch"))
(sha256
(base32
(patches (search-patches "ola-readdir-r.patch"))
(sha256
(base32
- "
09zx1c8nkj29shfdzkahrh9397m3mwnsy0gj7jrb63f89f3n2vlq
"))))
+ "
181imc9qkjm2m1iwrb5ixsckx893nc6qwjfzacsjlqp0jlnj8rca
"))))
(build-system gnu-build-system)
(native-inputs
`(("bison" ,bison)
(build-system gnu-build-system)
(native-inputs
`(("bison" ,bison)
@@
-56,10
+57,12
@@
`(("libftdi" ,libftdi)
("libmicrohttpd" ,libmicrohttpd)
("libusb" ,libusb)
`(("libftdi" ,libftdi)
("libmicrohttpd" ,libmicrohttpd)
("libusb" ,libusb)
- ("libuuid" ,util-linux)
+ ("libuuid" ,util-linux
"lib"
)
("zlib" ,zlib)))
(propagated-inputs
("zlib" ,zlib)))
(propagated-inputs
- `(("protobuf" ,protobuf))) ;; for pkg-config --libs libola
+ ;; Ola 0.10.5 only supports protobuf 2.x, and building it with 3.x breaks.
+ ;; XXX Remove protobuf-2 when it is no longer needed.
+ `(("protobuf" ,protobuf-2))) ;; for pkg-config --libs libola
(arguments
`(;; G++ >= 4.8 macro expansion tracking requires lots of memory, causing
;; build to fail on low memory systems. We disable that with the
(arguments
`(;; G++ >= 4.8 macro expansion tracking requires lots of memory, causing
;; build to fail on low memory systems. We disable that with the