ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-11-07 07:26:13 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: ola: Build with protobuf@3.

Browse source 
* gnu/packages/lighting.scm (ola)[propagated-inputs]: Use default protobuf version.
This commit is contained in:
Tobias Geerinckx-Rice 2020-08-16 12:15:48 +02:00
parent 784e7d7ae9
commit 50dee556f5
No known key found for this signature in database
GPG key ID: 0DB0FF884F556D79
2 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gnu/packages/games.scm
View file

@ -11659,7 +11659,7 @@ (define-public pokerth
("gsasl" ,gsasl)
("libgcrypt" ,libgcrypt)
("libircclient" ,libircclient)
("protobuf" ,protobuf-2)
("protobuf" ,protobuf-2) ; remove package when no longer needed
("qtbase" ,qtbase)
("sdl" ,(sdl-union (list sdl sdl-mixer)))
("sqlite" ,sqlite)

4
gnu/packages/lighting.scm
View file

@ -70,9 +70,7 @@ (define-public ola
("libuuid" ,util-linux "lib")
("zlib" ,zlib)))
(propagated-inputs
;; 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
`(("protobuf" ,protobuf))) ; 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