protobuf: remove old versions

This leaves only protobuf3_1 which is the last version with libprotobuf2.

Also fix several packages to build with the latest protobuf.
This commit is contained in:
Nikolay Amiantov
2017-09-09 05:54:43 +03:00
parent 4bdcb220c9
commit 1f2a18d916
13 changed files with 31 additions and 98 deletions
+3 -3
View File
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, autoreconfHook, bison, flex, pkgconfig
, libuuid, cppunit, protobuf, zlib, avahi, libmicrohttpd
, libuuid, cppunit, protobuf3_1, zlib, avahi, libmicrohttpd
, perl, python3, python3Packages
}:
@@ -15,8 +15,8 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ autoreconfHook bison flex pkgconfig perl ];
buildInputs = [ libuuid cppunit protobuf zlib avahi libmicrohttpd python3 ];
propagatedBuildInputs = with python3Packages; [ protobuf numpy ];
buildInputs = [ libuuid cppunit protobuf3_1 zlib avahi libmicrohttpd python3 ];
propagatedBuildInputs = [ python3Packages.protobuf3_1 python3Packages.numpy ];
configureFlags = [ "--enable-python-libs" ];