protobuf: default to 3.4

2017-09-05 18:11:41 +03:00
parent 721aba33b4
commit 6f7b62e038
11 changed files with 24 additions and 29 deletions
--- a/pkgs/tools/networking/envoy/default.nix
+++ b/pkgs/tools/networking/envoy/default.nix
@@ -1,6 +1,6 @@
 { stdenv, lib, fetchFromGitHub, pkgconfig, bazel, c-ares, backward-cpp
 , libevent, gtest, gperftools, http-parser, lightstep-tracer-cpp
-, nghttp2, protobuf3_2, tclap, rapidjson, spdlog, boringssl, buildEnv
+, nghttp2, protobuf, tclap, rapidjson, spdlog, boringssl, buildEnv
 }:

 let
@@ -85,7 +85,7 @@ let
    };

    protobuf = {
-      pkg = protobuf3_2;
+      pkg = protobuf;
      srcs = ''glob(["lib/libproto*.so"])'';
      hdrs = ''glob(["include/google/protobuf/**/*.h"])'';
      includes = ''["include"]'';
@@ -201,7 +201,7 @@ let
    http-parser
    lightstep-tracer-cpp
    nghttp2
-    protobuf3_2
+    protobuf
    tclap
    rapidjson
    spdlog