diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2020-06-04 15:30:23 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-06-04 15:30:36 +0200 |
| commit | af2dd0c798101dc112108859a3c427979d4802fc (patch) | |
| tree | 44a986e36967e9ebc068c283fc7018da07c2ed53 /pkgs/tools/compression/zstd/default.nix | |
| parent | b76c308ecdc7a90179b49a55abca0058e481cb5b (diff) | |
| download | nixpkgs-af2dd0c798101dc112108859a3c427979d4802fc.tar nixpkgs-af2dd0c798101dc112108859a3c427979d4802fc.tar.gz nixpkgs-af2dd0c798101dc112108859a3c427979d4802fc.tar.bz2 nixpkgs-af2dd0c798101dc112108859a3c427979d4802fc.tar.lz nixpkgs-af2dd0c798101dc112108859a3c427979d4802fc.tar.xz nixpkgs-af2dd0c798101dc112108859a3c427979d4802fc.tar.zst nixpkgs-af2dd0c798101dc112108859a3c427979d4802fc.zip | |
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 4df2f78ec72f6a8d2fe286cd34eb3acdfcac81f3.
Diffstat (limited to 'pkgs/tools/compression/zstd/default.nix')
| -rw-r--r-- | pkgs/tools/compression/zstd/default.nix | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/tools/compression/zstd/default.nix b/pkgs/tools/compression/zstd/default.nix index eb42fdbaff4..f919fb92ed1 100644 --- a/pkgs/tools/compression/zstd/default.nix +++ b/pkgs/tools/compression/zstd/default.nix @@ -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 = '' |