Merge pull request #25551 from knedlsepp/fix-pytables-on-darwin

pytables: Fix build on darwin by using external c-blosc
This commit is contained in:
Frederik Rietdijk 2017-05-06 10:59:20 +02:00 committed by GitHub
commit 2135e032e1
3 changed files with 29 additions and 2 deletions

View File

@ -0,0 +1,24 @@
{ stdenv, fetchFromGitHub, cmake }:
stdenv.mkDerivation rec {
name = "c-blosc";
version = "1.11.3";
src = fetchFromGitHub {
owner = "Blosc";
repo = "c-blosc";
rev = "v${version}";
sha256 = "18665lwszwbb48pxgisyxxjh92sr764hv6h7jw8zzsmzdkgzrmcw";
};
buildInputs = [ cmake ];
enableParallelBuilding = true;
meta = with stdenv.lib; {
description = "A blocking, shuffling and loss-less compression library";
homepage = http://www.blosc.org;
license = licenses.bsd3;
platforms = platforms.all;
};
}

View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, python, buildPythonPackage
, cython, bzip2, lzo, numpy, numexpr, hdf5, six }:
, cython, bzip2, lzo, numpy, numexpr, hdf5, six, c-blosc }:
buildPythonPackage rec {
version = "3.3.0";
@ -10,7 +10,7 @@ buildPythonPackage rec {
sha256 = "0b4211s0zzdmh74k49ss0m9lc2ql2iazq2aa95ams6h45vqcr0w3";
};
buildInputs = [ hdf5 cython bzip2 lzo ];
buildInputs = [ hdf5 cython bzip2 lzo c-blosc ];
propagatedBuildInputs = [ numpy numexpr six ];
# The setup script complains about missing run-paths, but they are
@ -19,6 +19,7 @@ buildPythonPackage rec {
[ "--hdf5=${hdf5}"
"--lzo=${lzo}"
"--bzip2=${bzip2.dev}"
"--blosc=${c-blosc}"
];
# Run the test suite.

View File

@ -7239,6 +7239,8 @@ with pkgs;
fetchurl = fetchurlBoot;
};
c-blosc = callPackage ../development/libraries/c-blosc { };
capnproto = callPackage ../development/libraries/capnproto { };
ccnx = callPackage ../development/libraries/ccnx { };