Revert "Revert "Merge pull request #78910 from serokell/libarchive-zstd""

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:36 +02:00
parent b76c308ecd
commit af2dd0c798
3 changed files with 11 additions and 5 deletions
+4 -2
View File
@@ -51,14 +51,16 @@ stdenv.mkDerivation rec {
preInstall = ''
substituteInPlace ../programs/zstdgrep \
--replace ":-grep" ":-${gnugrep}/bin/grep" \
--replace ":-zstdcat" ":-$out/bin/zstdcat"
--replace ":-zstdcat" ":-$bin/bin/zstdcat"
substituteInPlace ../programs/zstdless \
--replace "zstdcat" "$out/bin/zstdcat"
--replace "zstdcat" "$bin/bin/zstdcat"
'';
# Don't duplicate the library code in runtime closures.
postInstall = stdenv.lib.optionalString enableShared ''rm "$out"/lib/libzstd.a'';
outputs = [ "bin" "dev" "man" "out" ];
meta = with stdenv.lib; {
description = "Zstandard real-time compression algorithm";
longDescription = ''