diff options
-rw-r--r-- | pkgs/development/libraries/avro-c++/default.nix | 13 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 10 insertions, 5 deletions
diff --git a/pkgs/development/libraries/avro-c++/default.nix b/pkgs/development/libraries/avro-c++/default.nix index 2cd03253e7e..1214a8c974c 100644 --- a/pkgs/development/libraries/avro-c++/default.nix +++ b/pkgs/development/libraries/avro-c++/default.nix @@ -1,22 +1,27 @@ -{ stdenv, fetchurl, cmake, boost155, pythonPackages +{ stdenv, fetchurl, cmake, boost, pythonPackages }: -let version = "1.7.5"; in +let version = "1.8.1"; in stdenv.mkDerivation { name = "avro-c++-${version}"; src = fetchurl { url = "mirror://apache/avro/avro-${version}/cpp/avro-cpp-${version}.tar.gz"; - sha256 = "064ssbbgrc3hyalzj8rn119bsrnyk1vlpkhl8gghv96jgqbpdyb3"; + sha256 = "6559755ac525e908e42a2aa43444576cba91e522fe989088ee7f70c169bcc403"; }; buildInputs = [ cmake - boost155 + boost pythonPackages.python ]; + preConfigure = '' + substituteInPlace test/SchemaTests.cc --replace "BOOST_CHECKPOINT" "BOOST_TEST_CHECKPOINT" + substituteInPlace test/buffertest.cc --replace "BOOST_MESSAGE" "BOOST_TEST_MESSAGE" + ''; + enableParallelBuilding = true; meta = { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d15ea58090d..b28b17e278e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -564,7 +564,7 @@ in qt4Support = config.avahi.qt4Support or false; }; - avro-cpp = callPackage ../development/libraries/avro-c++ { }; + avro-cpp = callPackage ../development/libraries/avro-c++ { boost = boost160; }; aws = callPackage ../tools/virtualization/aws { }; |