diff options
| author | Vladimír Čunát <v@cunat.cz> | 2020-05-29 15:31:19 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2020-05-29 15:37:55 +0200 |
| commit | afa9962538b12237f5a4604017fe9c0914404800 (patch) | |
| tree | 314d63f212523aee8732c82aa331e8f9a03c785e /pkgs/development/libraries/libarchive | |
| parent | 3a4fec82326f53fd14721aa3c4fd8560752f8982 (diff) | |
| parent | 7f76daacdb0190ce91c95111cc3eba49cea41fd7 (diff) | |
| download | nixpkgs-afa9962538b12237f5a4604017fe9c0914404800.tar nixpkgs-afa9962538b12237f5a4604017fe9c0914404800.tar.gz nixpkgs-afa9962538b12237f5a4604017fe9c0914404800.tar.bz2 nixpkgs-afa9962538b12237f5a4604017fe9c0914404800.tar.lz nixpkgs-afa9962538b12237f5a4604017fe9c0914404800.tar.xz nixpkgs-afa9962538b12237f5a4604017fe9c0914404800.tar.zst nixpkgs-afa9962538b12237f5a4604017fe9c0914404800.zip | |
Merge #78910: libarchive: link to zstd (into staging)
Also split outputs and don't provide static lib by default.
Diffstat (limited to 'pkgs/development/libraries/libarchive')
| -rw-r--r-- | pkgs/development/libraries/libarchive/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/libraries/libarchive/default.nix b/pkgs/development/libraries/libarchive/default.nix index 118adc61623..d1917de37d6 100644 --- a/pkgs/development/libraries/libarchive/default.nix +++ b/pkgs/development/libraries/libarchive/default.nix @@ -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; |