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/tools/compression | |
| 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/tools/compression')
| -rw-r--r-- | pkgs/tools/compression/zstd/default.nix | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/pkgs/tools/compression/zstd/default.nix b/pkgs/tools/compression/zstd/default.nix index f919fb92ed1..eb42fdbaff4 100644 --- a/pkgs/tools/compression/zstd/default.nix +++ b/pkgs/tools/compression/zstd/default.nix @@ -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 = '' |