Merge #78910: libarchive: link to zstd (into staging)

Also split outputs and don't provide static lib by default.
This commit is contained in:
Vladimír Čunát
2020-05-29 15:37:55 +02:00
3 changed files with 14 additions and 5 deletions
@@ -1,6 +1,6 @@
{
fetchFromGitHub, stdenv, pkgconfig, autoreconfHook,
acl, attr, bzip2, e2fsprogs, libxml2, lzo, openssl, sharutils, xz, zlib,
acl, attr, bzip2, e2fsprogs, libxml2, lzo, openssl, sharutils, xz, zlib, zstd,
# Optional but increases closure only negligibly.
xarSupport ? true,
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
outputs = [ "out" "lib" "dev" ];
nativeBuildInputs = [ pkgconfig autoreconfHook ];
buildInputs = [ sharutils zlib bzip2 openssl xz lzo ]
buildInputs = [ sharutils zlib bzip2 openssl xz lzo zstd ]
++ stdenv.lib.optionals stdenv.isLinux [ e2fsprogs attr acl ]
++ stdenv.lib.optional xarSupport libxml2;