diff options
author | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2017-05-06 10:59:20 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-05-06 10:59:20 +0200 |
commit | 2135e032e17da106b3482036f7da09a1e0f27832 (patch) | |
tree | 35513e85ea55d3e40b0b62a1478a252942597564 /pkgs | |
parent | cc00ca657f5e66fa2b637df51dd296cb28e9244b (diff) | |
parent | facf9a6d22966c9ab664e669b7a68f814dc2337f (diff) |
Merge pull request #25551 from knedlsepp/fix-pytables-on-darwin
pytables: Fix build on darwin by using external c-blosc
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/libraries/c-blosc/default.nix | 24 | ||||
-rw-r--r-- | pkgs/development/python-modules/tables/default.nix | 5 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
3 files changed, 29 insertions, 2 deletions
diff --git a/pkgs/development/libraries/c-blosc/default.nix b/pkgs/development/libraries/c-blosc/default.nix new file mode 100644 index 0000000000000..5066b0a3250bf --- /dev/null +++ b/pkgs/development/libraries/c-blosc/default.nix @@ -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; + }; +} diff --git a/pkgs/development/python-modules/tables/default.nix b/pkgs/development/python-modules/tables/default.nix index e5de7c4e2a42f..7faad8ec4f462 100644 --- a/pkgs/development/python-modules/tables/default.nix +++ b/pkgs/development/python-modules/tables/default.nix @@ -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. diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e4ed1329f9f23..5febd6cbbb4f2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { }; |