diff options
author | Sergei Trofimovich <slyich@gmail.com> | 2023-02-02 11:54:12 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-02-02 11:54:12 +0000 |
commit | a67949a3fca213ae0c6eddceaa0ec744ed670db5 (patch) | |
tree | 11dc2b5cafe4f466740aed4c6778f23e47cf1f9b | |
parent | b5a491579de92570ad8d42a4acaa0d1091d414d8 (diff) | |
parent | ab04f4777b5e0fca66e2ebd51cc23eb7848b8269 (diff) |
Merge pull request #211571 from bouk/bouk/boost-add-zstd-lzma
boost: add zstd and lzma support
-rw-r--r-- | pkgs/development/libraries/boost/generic.nix | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix index 4c6ba700457ff..4268af7ee0bb6 100644 --- a/pkgs/development/libraries/boost/generic.nix +++ b/pkgs/development/libraries/boost/generic.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, icu, expat, zlib, bzip2, python ? null, fixDarwinDylibNames, libiconv, libxcrypt +{ lib, stdenv, icu, expat, zlib, bzip2, zstd, xz, python ? null, fixDarwinDylibNames, libiconv, libxcrypt , boost-build , fetchpatch , which @@ -226,6 +226,8 @@ stdenv.mkDerivation { nativeBuildInputs = [ which boost-build ] ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; buildInputs = [ expat zlib bzip2 libiconv ] + ++ lib.optional (lib.versionAtLeast version "1.69") zstd + ++ lib.optional (lib.versionAtLeast version "1.65") xz ++ lib.optional enableIcu icu ++ lib.optionals enablePython [ libxcrypt python ] ++ lib.optional enableNumpy python.pkgs.numpy; |