summary refs log tree commit diff
path: root/pkgs/development/libraries
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2014-11-25 12:59:56 +0100
committerEelco Dolstra <eelco.dolstra@logicblox.com>2014-11-25 13:00:09 +0100
commit1fdefd5562be9f8b726e20a8f0bfab46cc7ae024 (patch)
tree12f979e099f3084cc6ac7978812680fd8075ee59 /pkgs/development/libraries
parent4158847b3e740364d0ee4e163b8bc22918cd8f91 (diff)
downloadnixpkgs-1fdefd5562be9f8b726e20a8f0bfab46cc7ae024.tar
nixpkgs-1fdefd5562be9f8b726e20a8f0bfab46cc7ae024.tar.gz
nixpkgs-1fdefd5562be9f8b726e20a8f0bfab46cc7ae024.tar.bz2
nixpkgs-1fdefd5562be9f8b726e20a8f0bfab46cc7ae024.tar.lz
nixpkgs-1fdefd5562be9f8b726e20a8f0bfab46cc7ae024.tar.xz
nixpkgs-1fdefd5562be9f8b726e20a8f0bfab46cc7ae024.tar.zst
nixpkgs-1fdefd5562be9f8b726e20a8f0bfab46cc7ae024.zip
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.
Diffstat (limited to 'pkgs/development/libraries')
-rw-r--r--pkgs/development/libraries/protobuf/default.nix41
1 files changed, 14 insertions, 27 deletions
diff --git a/pkgs/development/libraries/protobuf/default.nix b/pkgs/development/libraries/protobuf/default.nix
index 0f52999bc0e..bba8481780a 100644
--- a/pkgs/development/libraries/protobuf/default.nix
+++ b/pkgs/development/libraries/protobuf/default.nix
@@ -1,41 +1,28 @@
-{ stdenv, fetchFromGitHub, autoconf, automake, libtool, zlib, gtest }:
+{ fetchurl, stdenv, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "protobuf-${version}";
-  version = "2.6.1";
-
-  src = fetchFromGitHub {
-    owner = "google";
-    repo = "protobuf";
-    rev = version;
-    sha256 = "03df8zvx2sry3jz2x4pi3l32qyfqa7w8kj8jdbz30nzy0h7aa070";
-  };
-
-  postPatch = ''
-    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
-  '';
+  name = "protobuf-2.5.0";
 
-  buildInputs = [ zlib autoconf automake libtool gtest ];
+  src = fetchurl {
+    url = "http://protobuf.googlecode.com/files/${name}.tar.bz2";
+    sha256 = "0xxn9gxhvsgzz2sgmihzf6pf75clr05mqj6218camwrwajpcbgqk";
+  };
 
-  preConfigure = "autoreconf -vfi";
+  buildInputs = [ zlib ];
 
   doCheck = true;
 
   meta = {
     description = "Protocol Buffers - Google's data interchange format";
 
-    longDescription = ''
-      Protocol Buffers are a way of encoding structured data in an
-      efficient yet extensible format. Google uses Protocol Buffers for
-      almost all of its internal RPC protocols and file formats.
-    '';
+    longDescription =
+      '' Protocol Buffers are a way of encoding structured data in an
+         efficient yet extensible format.  Google uses Protocol Buffers for
+         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/;
   };
 }