diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2017-10-22 20:12:52 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2017-10-22 20:12:52 +0200 |
| commit | 119a749db9c9847e0766860c17109b0f0b6bf349 (patch) | |
| tree | 4cdbfcad285124c1abf7b3c1c94666cef55767ce /gnu/packages/lighting.scm | |
| parent | 530d9e1555e8d0125dde6893f5f70c7a1ebc2564 (diff) | |
| parent | 25669275a1a570cc266128274cb27a22f6a3a318 (diff) | |
| download | guix-119a749db9c9847e0766860c17109b0f0b6bf349.tar guix-119a749db9c9847e0766860c17109b0f0b6bf349.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/lighting.scm')
| -rw-r--r-- | gnu/packages/lighting.scm | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/gnu/packages/lighting.scm b/gnu/packages/lighting.scm index 7f01cdbc99..ab7069b53b 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 <jjfoerch@earthlink.net> +;;; Copyright © 2017 Tobias Geerinckx-Rice <me@tobias.gr> ;;; ;;; 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 |