futurile/guix-play
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gnu: ola: Build with protobuf@2.

Browse Source 
This follows up commit dd12d4aad0.

* gnu/packages/protobuf.scm (protobuf-2): New variable.
* gnu/packages/lighting.scm (ola)[propagated-inputs]: Use it.
This commit is contained in:
Tobias Geerinckx-Rice 2017-10-20 17:45:12 +02:00
parent 77aa706ab6
commit fa9ac83ec4
No known key found for this signature in database
GPG Key ID: 0DB0FF884F556D79
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gnu/packages/lighting.scm
View File

@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2016 John J. Foerch <jjfoerch@earthlink.net> ;;; Copyright © 2016 John J. Foerch <jjfoerch@earthlink.net>
;;; Copyright © 2017 Tobias Geerinckx-Rice <me@tobias.gr>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -59,7 +60,9 @@
("libuuid" ,util-linux) ("libuuid" ,util-linux)
("zlib" ,zlib))) ("zlib" ,zlib)))
(propagated-inputs (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 (arguments
`(;; G++ >= 4.8 macro expansion tracking requires lots of memory, causing `(;; G++ >= 4.8 macro expansion tracking requires lots of memory, causing
;; build to fail on low memory systems. We disable that with the ;; build to fail on low memory systems. We disable that with the

14
gnu/packages/protobuf.scm
View File

@ -3,6 +3,7 @@
;;; Copyright © 2016 Daniel Pimentel <d4n1@d4n1.org> ;;; Copyright © 2016 Daniel Pimentel <d4n1@d4n1.org>
;;; Copyright © 2016 Leo Famulari <leo@famulari.name> ;;; Copyright © 2016 Leo Famulari <leo@famulari.name>
;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2017 Tobias Geerinckx-Rice <me@tobias.gr>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -53,6 +54,19 @@ yet extensible format. Google uses Protocol Buffers for almost all of its
internal RPC protocols and file formats.") internal RPC protocols and file formats.")
(license bsd-3))) (license bsd-3)))
;; XXX Remove this old version when no other packages depend on it.
(define-public protobuf-2
(package (inherit protobuf)
(version "2.6.1")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/google/protobuf/releases/"
"download/v" version "/protobuf-"
version ".tar.bz2"))
(sha256
(base32
"040rcs9fpv4bslhiy43v7dcrzakz4vwwpyqg4jp8bn24sl95ci7f"))))))
(define-public protobuf-c (define-public protobuf-c
(package (package
(name "protobuf-c") (name "protobuf-c")