Revert "protobuf: Clean up and update to version 2.6.1."
This reverts commit 18b306b0414c13b5584c2325e9a01e065d715498. Protobuf releases are generally not very backwards compatible and likely to break lots of stuff. E.g. http://hydra.nixos.org/build/17535340 http://hydra.nixos.org/build/17535640 http://hydra.nixos.org/build/17536998 http://hydra.nixos.org/build/17536170 See also b851e970daee1cd4a6b6977c9f67ed16cefc1229.
This commit is contained in:
parent
4158847b3e
commit
1fdefd5562
@ -1,41 +1,28 @@
|
|||||||
{ stdenv, fetchFromGitHub, autoconf, automake, libtool, zlib, gtest }:
|
{ fetchurl, stdenv, zlib }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "protobuf-${version}";
|
name = "protobuf-2.5.0";
|
||||||
version = "2.6.1";
|
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchurl {
|
||||||
owner = "google";
|
url = "http://protobuf.googlecode.com/files/${name}.tar.bz2";
|
||||||
repo = "protobuf";
|
sha256 = "0xxn9gxhvsgzz2sgmihzf6pf75clr05mqj6218camwrwajpcbgqk";
|
||||||
rev = version;
|
|
||||||
sha256 = "03df8zvx2sry3jz2x4pi3l32qyfqa7w8kj8jdbz30nzy0h7aa070";
|
|
||||||
};
|
};
|
||||||
|
|
||||||
postPatch = ''
|
buildInputs = [ zlib ];
|
||||||
sed -i -e '/gtest/d' Makefile.am
|
|
||||||
sed -i \
|
|
||||||
-e 's!\$(top_\(build\|src\)dir)/gtest!${gtest}!g' \
|
|
||||||
-e 's/\(libgtest[^.]*\.\)la/\1a/g' \
|
|
||||||
src/Makefile.am
|
|
||||||
'';
|
|
||||||
|
|
||||||
buildInputs = [ zlib autoconf automake libtool gtest ];
|
|
||||||
|
|
||||||
preConfigure = "autoreconf -vfi";
|
|
||||||
|
|
||||||
doCheck = true;
|
doCheck = true;
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
description = "Protocol Buffers - Google's data interchange format";
|
description = "Protocol Buffers - Google's data interchange format";
|
||||||
|
|
||||||
longDescription = ''
|
longDescription =
|
||||||
Protocol Buffers are a way of encoding structured data in an
|
'' Protocol Buffers are a way of encoding structured data in an
|
||||||
efficient yet extensible format. Google uses Protocol Buffers for
|
efficient yet extensible format. Google uses Protocol Buffers for
|
||||||
almost all of its internal RPC protocols and file formats.
|
almost all of its internal RPC protocols and file formats.
|
||||||
'';
|
'';
|
||||||
|
|
||||||
license = stdenv.lib.licenses.bsd3;
|
license = "mBSD";
|
||||||
|
|
||||||
homepage = "https://developers.google.com/protocol-buffers/";
|
homepage = http://code.google.com/p/protobuf/;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user