From 8a74451273f50f69d3ed27344600771d99443190 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Mon, 31 Aug 2015 07:45:18 -0500
Subject: nixpkgs: scrypt 1.1.6 -> 1.2.0

Now with less build breakage!
---
 pkgs/tools/security/scrypt/default.nix | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

(limited to 'pkgs/tools/security/scrypt')

diff --git a/pkgs/tools/security/scrypt/default.nix b/pkgs/tools/security/scrypt/default.nix
index 668a76051153a..893b7b3190006 100644
--- a/pkgs/tools/security/scrypt/default.nix
+++ b/pkgs/tools/security/scrypt/default.nix
@@ -2,15 +2,24 @@
 
 stdenv.mkDerivation rec {
   name = "scrypt-${version}";
-  version = "1.1.6";
+  version = "1.2.0";
 
   src = fetchurl {
-    url = "https://www.tarsnap.com/scrypt/scrypt-1.1.6.tgz";
-    sha256 = "dfd0d1a544439265bbb9b58043ad3c8ce50a3987b44a61b1d39fd7a3ed5b7fb8";
+    url = "https://www.tarsnap.com/scrypt/${name}.tgz";
+    sha256 = "1m39hpfby0fdjam842773i5w7pa0qaj7f0r22jnchxsj824vqm0p";
   };
 
   buildInputs = [ openssl ];
 
+  patchPhase = ''
+    substituteInPlace Makefile \
+      --replace "command -p mv" "mv"
+    substituteInPlace Makefile.in \
+      --replace "command -p mv" "mv"
+    substituteInPlace autocrap/Makefile.am \
+      --replace "command -p mv" "mv"
+  '';
+
   meta = {
     description = "Encryption utility";
     homepage    = https://www.tarsnap.com/scrypt.html;
-- 
cgit 1.4.1