nixpkgs: tarsnap 1.0.35 -> 1.0.36.1

This also fixes the same build failure present in `scrypt-1.2.0`,
which is quite trivial.

(partially cherry picked from commit 54c7053b)

Signed-off-by: Austin Seipp <aseipp@pobox.com>

1 files changed, 13 insertions, 11 deletions

diff --git a/pkgs/tools/backup/tarsnap/default.nix b/pkgs/tools/backup/tarsnap/default.nix
index e2857eed7d86..f2ae4e83ad1a 100644
--- a/pkgs/tools/backup/tarsnap/default.nix
+++ b/pkgs/tools/backup/tarsnap/default.nix
@@ -1,11 +1,6 @@
 { stdenv, fetchurl, openssl, zlib, e2fsprogs }:
 
 let
-  bashCompletion = fetchurl {
-    url = "https://gist.githubusercontent.com/thoughtpolice/daa9431044883d3896f6/raw/282360677007db9739e5bf229873d3b231eb303a/tarsnap.bash";
-    sha256 = "1cj7m0n3sw9vlaz2dfvf0bgaxkv1pcc0l31zb4h5rmm8z6d33405";
-  };
-
   zshCompletion = fetchurl {
     url = "https://gist.githubusercontent.com/thoughtpolice/daa9431044883d3896f6/raw/282360677007db9739e5bf229873d3b231eb303a/tarsnap.zsh";
     sha256 = "0pawqwichzpz29rva7mh8lpx4zznnrh2rqyzzj6h7z98l0dxpair";
@@ -13,18 +8,25 @@ let
 in
 stdenv.mkDerivation rec {
   name = "tarsnap-${version}";
-  version = "1.0.35";
+  version = "1.0.36.1";
 
   src = fetchurl {
-    url = "https://www.tarsnap.com/download/tarsnap-autoconf-1.0.35.tgz";
-    sha256 = "16lc14rwrq84fz95j1g10vv0qki0qw73lzighidj5g23pib6g7vc";
+    url = "https://www.tarsnap.com/download/tarsnap-autoconf-${version}.tgz";
+    sha256 = "1446l8g39bi5xxk4x1ijc1qjrj824729887gcffig0zrw80rx452";
   };
 
+  preConfigure = ''
+    configureFlags="--with-bash-completion-dir=$out/etc/bash_completion.d"
+  '';
+
+  patchPhase = ''
+    substituteInPlace Makefile.in \
+      --replace "command -p mv" "mv"
+  '';
+
   postInstall = ''
     # Install some handy-dandy shell completions
-    mkdir -p $out/etc/bash_completion.d $out/share/zsh/site-functions
-    cp ${bashCompletion} $out/etc/bash_completion.d/tarsnap.bash
-    cp ${zshCompletion}  $out/share/zsh/site-functions/_tarsnap
+    install -m 444 -D ${zshCompletion} $out/share/zsh/site-functions/_tarsnap
   '';
 
   buildInputs = [ openssl zlib e2fsprogs ];