diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2017-05-11 13:53:12 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-11 13:53:12 +0100 |
| commit | b77a3466f8c85be2f58cc0f5c0467fcf104951ab (patch) | |
| tree | 8ad88c36da99716203b9f43571346e0814963b7b /pkgs | |
| parent | 93f47559b291d932335a4c36a2bf469b0e252101 (diff) | |
| parent | cb1af17f53fbd0971e923bd90604159aa694057c (diff) | |
| download | nixpkgs-b77a3466f8c85be2f58cc0f5c0467fcf104951ab.tar nixpkgs-b77a3466f8c85be2f58cc0f5c0467fcf104951ab.tar.gz nixpkgs-b77a3466f8c85be2f58cc0f5c0467fcf104951ab.tar.bz2 nixpkgs-b77a3466f8c85be2f58cc0f5c0467fcf104951ab.tar.lz nixpkgs-b77a3466f8c85be2f58cc0f5c0467fcf104951ab.tar.xz nixpkgs-b77a3466f8c85be2f58cc0f5c0467fcf104951ab.tar.zst nixpkgs-b77a3466f8c85be2f58cc0f5c0467fcf104951ab.zip | |
Merge pull request #25679 from orivej/zstd
zstd: 1.1.3 -> 1.2.0
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/tools/compression/zstd/default.nix | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/pkgs/tools/compression/zstd/default.nix b/pkgs/tools/compression/zstd/default.nix index dba6e6fc337..82ead0baa16 100644 --- a/pkgs/tools/compression/zstd/default.nix +++ b/pkgs/tools/compression/zstd/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchFromGitHub +{ stdenv, fetchFromGitHub, gnugrep , legacySupport ? false }: stdenv.mkDerivation rec { name = "zstd-${version}"; - version = "1.1.3"; + version = "1.2.0"; src = fetchFromGitHub { - sha256 = "1d46hs6pyq55izcmnk7hzvbl8iyxh7bp7qchc7rl8ay396ax2sd5"; + sha256 = "01b5w4yrwa8lgnjyi42zxjhw8cfyh8yfhdsjr04y5qsblz0hv0zl"; rev = "v${version}"; repo = "zstd"; owner = "facebook"; @@ -24,6 +24,15 @@ stdenv.mkDerivation rec { "PREFIX=$(out)" ]; + preInstall = '' + substituteInPlace programs/zstdgrep \ + --replace "=grep" "=${gnugrep}/bin/grep" \ + --replace "=zstdcat" "=$out/bin/zstdcat" + + substituteInPlace programs/zstdless \ + --replace "zstdcat" "$out/bin/zstdcat" + ''; + meta = with stdenv.lib; { description = "Zstandard real-time compression algorithm"; longDescription = '' @@ -40,6 +49,6 @@ stdenv.mkDerivation rec { license = with licenses; [ gpl2Plus bsd2 ]; platforms = platforms.unix; - maintainers = with maintainers; [ nckx ]; + maintainers = with maintainers; [ nckx orivej ]; }; } |