public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
Frederik Rietdijk
2020-06-04 15:25:54 +02:00
parent 458b2cb7d6 3327b9a385
commit 08900c0554
461 changed files with 22534 additions and 21978 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/tools/compression/zstd/default.nix
View File

@@ -51,16 +51,14 @@ stdenv.mkDerivation rec {
preInstall = ''
substituteInPlace ../programs/zstdgrep \
--replace ":-grep" ":-${gnugrep}/bin/grep" \
--replace ":-zstdcat" ":-$bin/bin/zstdcat"
--replace ":-zstdcat" ":-$out/bin/zstdcat"
substituteInPlace ../programs/zstdless \
--replace "zstdcat" "$bin/bin/zstdcat"
--replace "zstdcat" "$out/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 = ''