diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2020-06-04 15:25:54 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-06-04 15:25:54 +0200 |
| commit | 08900c0554657442c60c86e54081325c0f4cedce (patch) | |
| tree | 4e7a2e330991ee3eb08cf6b51d3f44ae47ae03f3 /pkgs/development/libraries/libarchive | |
| parent | 458b2cb7d67561c796c6f0660a97eea9b685fc65 (diff) | |
| parent | 3327b9a385f5ec2e219bf93b48896772b3f66afc (diff) | |
| download | nixpkgs-08900c0554657442c60c86e54081325c0f4cedce.tar nixpkgs-08900c0554657442c60c86e54081325c0f4cedce.tar.gz nixpkgs-08900c0554657442c60c86e54081325c0f4cedce.tar.bz2 nixpkgs-08900c0554657442c60c86e54081325c0f4cedce.tar.lz nixpkgs-08900c0554657442c60c86e54081325c0f4cedce.tar.xz nixpkgs-08900c0554657442c60c86e54081325c0f4cedce.tar.zst nixpkgs-08900c0554657442c60c86e54081325c0f4cedce.zip | |
Merge master into staging-next
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 d1917de37d6..118adc61623 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, zstd, + acl, attr, bzip2, e2fsprogs, libxml2, lzo, openssl, sharutils, xz, zlib, # 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 zstd ] + buildInputs = [ sharutils zlib bzip2 openssl xz lzo ] ++ stdenv.lib.optionals stdenv.isLinux [ e2fsprogs attr acl ] ++ stdenv.lib.optional xarSupport libxml2; |