From 4df2f78ec72f6a8d2fe286cd34eb3acdfcac81f3 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 29 May 2020 21:03:02 +0200 Subject: Revert "Merge pull request #78910 from serokell/libarchive-zstd" Should go to staging instead. This reverts commit f8d9f59abe02ce97f621da24723156934a54611e, reversing changes made to b27a19d5bf799f581a8afc2b554f178e58c1f524. --- pkgs/development/libraries/libarchive/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries/libarchive') diff --git a/pkgs/development/libraries/libarchive/default.nix b/pkgs/development/libraries/libarchive/default.nix index 69feed39818c3..0f6b196d15074 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; -- cgit 1.4.1