public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

protobuf: default to 3.4

Browse Source
This commit is contained in:
Nikolay Amiantov
2017-09-05 18:11:41 +03:00
parent 721aba33b4
commit 6f7b62e038
11 changed files with 24 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/lightstep-tracer-cpp/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, lib, fetchFromGitHub, pkgconfig, protobuf3_2, automake
{ stdenv, lib, fetchFromGitHub, pkgconfig, protobuf, automake
, autoreconfHook, zlib
, enableGrpc ? false
}:
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
];
buildInputs = [
protobuf3_2 zlib
protobuf zlib
];
meta = with lib; {

4
pkgs/development/libraries/opencv/3.x.nix
View File

@@ -8,7 +8,7 @@
, enableJPEG2K ? true, jasper
, enableIpp ? false
, enableContrib ? false, protobuf3_1
, enableContrib ? false, protobuf
, enablePython ? false, pythonPackages
, enableGtk2 ? false, gtk2
, enableGtk3 ? false, gtk3
@@ -146,7 +146,7 @@ stdenv.mkDerivation rec {
# tesseract & leptonica.
++ lib.optionals enableTesseract [ tesseract leptonica ]
++ lib.optionals enableCuda [ cudatoolkit gcc5 ]
++ lib.optional buildContrib protobuf3_1
++ lib.optional buildContrib protobuf
++ lib.optionals stdenv.isDarwin [ AVFoundation Cocoa QTKit ];
propagatedBuildInputs = lib.optional enablePython pythonPackages.numpy;