JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 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:23 +02:00
parent b76c308ecd
commit af2dd0c798
3 changed files with 11 additions and 5 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/tools/compression/zstd/default.nix
View File

@ -51,14 +51,16 @@ stdenv.mkDerivation rec {
preInstall = '' preInstall = ''
substituteInPlace ../programs/zstdgrep \ substituteInPlace ../programs/zstdgrep \
--replace ":-grep" ":-${gnugrep}/bin/grep" \ --replace ":-grep" ":-${gnugrep}/bin/grep" \
--replace ":-zstdcat" ":-$out/bin/zstdcat" --replace ":-zstdcat" ":-$bin/bin/zstdcat"
substituteInPlace ../programs/zstdless \ substituteInPlace ../programs/zstdless \
--replace "zstdcat" "$out/bin/zstdcat" --replace "zstdcat" "$bin/bin/zstdcat"
''; '';
# Don't duplicate the library code in runtime closures. # Don't duplicate the library code in runtime closures.
postInstall = stdenv.lib.optionalString enableShared ''rm "$out"/lib/libzstd.a''; postInstall = stdenv.lib.optionalString enableShared ''rm "$out"/lib/libzstd.a'';
outputs = [ "bin" "dev" "man" "out" ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Zstandard real-time compression algorithm"; description = "Zstandard real-time compression algorithm";
longDescription = '' longDescription = ''

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

@ -7899,7 +7899,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 { };