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

libarchive: link against zstd

Browse Source
This commit is contained in:
Yorick van Pelt 2020-01-30 21:17:52 +01:00
parent fe9a655054
commit 414da94fed
No known key found for this signature in database
GPG Key ID: A36E70F9DC014A15
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/libarchive/default.nix
View File

@ -1,6 +1,6 @@
{ {
fetchFromGitHub, stdenv, pkgconfig, autoreconfHook, 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. # Optional but increases closure only negligibly.
xarSupport ? true, xarSupport ? true,
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
outputs = [ "out" "lib" "dev" ]; outputs = [ "out" "lib" "dev" ];
nativeBuildInputs = [ pkgconfig autoreconfHook ]; 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.optionals stdenv.isLinux [ e2fsprogs attr acl ]
++ stdenv.lib.optional xarSupport libxml2; ++ stdenv.lib.optional xarSupport libxml2;

6
pkgs/top-level/all-packages.nix
View File

@ -7649,7 +7649,11 @@ in
zssh = callPackage ../tools/networking/zssh { }; zssh = callPackage ../tools/networking/zssh { };
zstd = callPackage ../tools/compression/zstd { }; zstd = callPackage ../tools/compression/zstd {
cmake = cmake.override {
libarchive = libarchive.override { zstd = null; };
};
};
zsync = callPackage ../tools/compression/zsync { }; zsync = callPackage ../tools/compression/zsync { };