[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/04: gnu: ola: Build with address@hidden
From: |
Tobias Geerinckx-Rice |
Subject: |
02/04: gnu: ola: Build with address@hidden |
Date: |
Fri, 20 Oct 2017 13:46:23 -0400 (EDT) |
nckx pushed a commit to branch master
in repository guix.
commit fa9ac83ec4098ba89c8cc3c9671144fe853fbc06
Author: Tobias Geerinckx-Rice <address@hidden>
Date: Fri Oct 20 17:45:12 2017 +0200
gnu: ola: Build with address@hidden
This follows up commit dd12d4aad02fc83e00e7b09d676aa78bcb7dd476.
* gnu/packages/protobuf.scm (protobuf-2): New variable.
* gnu/packages/lighting.scm (ola)[propagated-inputs]: Use it.
---
gnu/packages/lighting.scm | 5 ++++-
gnu/packages/protobuf.scm | 14 ++++++++++++++
2 files changed, 18 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/lighting.scm b/gnu/packages/lighting.scm
index 7f01cdb..ab7069b 100644
--- 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 <address@hidden>
+;;; Copyright © 2017 Tobias Geerinckx-Rice <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -59,7 +60,9 @@
("libuuid" ,util-linux)
("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
diff --git a/gnu/packages/protobuf.scm b/gnu/packages/protobuf.scm
index 5495582..2e681ca 100644
--- a/gnu/packages/protobuf.scm
+++ b/gnu/packages/protobuf.scm
@@ -3,6 +3,7 @@
;;; Copyright © 2016 Daniel Pimentel <address@hidden>
;;; Copyright © 2016 Leo Famulari <address@hidden>
;;; Copyright © 2017 Ricardo Wurmus <address@hidden>
+;;; Copyright © 2017 Tobias Geerinckx-Rice <address@hidden>
;;;
;;; 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.")
(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
(package
(name "protobuf-c")