summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorOrivej Desh <orivej@gmx.fr>2017-05-10 17:52:34 +0000
committerOrivej Desh <orivej@gmx.fr>2017-05-10 17:52:34 +0000
commitcb1af17f53fbd0971e923bd90604159aa694057c (patch)
treeb1fb784ddb3528a56130398fa58bde0e7bcd7168 /pkgs
parent6fc56fa8d4c7ba259e44080c1c34a0d74a276eb2 (diff)
downloadnixpkgs-cb1af17f53fbd0971e923bd90604159aa694057c.tar
nixpkgs-cb1af17f53fbd0971e923bd90604159aa694057c.tar.gz
nixpkgs-cb1af17f53fbd0971e923bd90604159aa694057c.tar.bz2
nixpkgs-cb1af17f53fbd0971e923bd90604159aa694057c.tar.lz
nixpkgs-cb1af17f53fbd0971e923bd90604159aa694057c.tar.xz
nixpkgs-cb1af17f53fbd0971e923bd90604159aa694057c.tar.zst
nixpkgs-cb1af17f53fbd0971e923bd90604159aa694057c.zip
zstd: 1.1.3 -> 1.2.0
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/tools/compression/zstd/default.nix17
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 ];
   };
 }