diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2020-05-29 21:03:02 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-05-29 21:03:02 +0200 |
| commit | 4df2f78ec72f6a8d2fe286cd34eb3acdfcac81f3 (patch) | |
| tree | 7b16c7b7765844d51252c96f96c0eaaf4a4226ca /pkgs/tools/compression | |
| parent | f8d9f59abe02ce97f621da24723156934a54611e (diff) | |
| download | nixpkgs-4df2f78ec72f6a8d2fe286cd34eb3acdfcac81f3.tar nixpkgs-4df2f78ec72f6a8d2fe286cd34eb3acdfcac81f3.tar.gz nixpkgs-4df2f78ec72f6a8d2fe286cd34eb3acdfcac81f3.tar.bz2 nixpkgs-4df2f78ec72f6a8d2fe286cd34eb3acdfcac81f3.tar.lz nixpkgs-4df2f78ec72f6a8d2fe286cd34eb3acdfcac81f3.tar.xz nixpkgs-4df2f78ec72f6a8d2fe286cd34eb3acdfcac81f3.tar.zst nixpkgs-4df2f78ec72f6a8d2fe286cd34eb3acdfcac81f3.zip | |
Revert "Merge pull request #78910 from serokell/libarchive-zstd"
Should go to staging instead. This reverts commit f8d9f59abe02ce97f621da24723156934a54611e, reversing changes made to b27a19d5bf799f581a8afc2b554f178e58c1f524.
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 d1ed0da1d14..2f89331f92c 100644 --- a/pkgs/tools/compression/zstd/default.nix +++ b/pkgs/tools/compression/zstd/default.nix @@ -50,14 +50,12 @@ 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" ''; - outputs = [ "bin" "dev" "man" "out" ]; - meta = with stdenv.lib; { description = "Zstandard real-time compression algorithm"; longDescription = '' |