public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Revert "Merge pull request #78910 from serokell/libarchive-zstd""

Browse Source 
The PR was accidentally merged into master instead of staging and thus reverted. Now, in staging, we can re-revert it.

This reverts commit 4df2f78ec7.
This commit is contained in:
Frederik Rietdijk
2020-06-04 15:30:36 +02:00
parent b76c308ecd
commit af2dd0c798
3 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/libarchive/default.nix
+2 -2
View File
@@ -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;