From bf01a11ac1b948057a8c21137fc85fd60c4439c1 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Wed, 14 Feb 2018 13:29:33 +0100
Subject: [PATCH] fscryptctl: 2017-09-12 -> 2017-10-23

---
 pkgs/os-specific/linux/fscryptctl/default.nix |  8 +++----
 .../linux/fscryptctl/install.patch            | 22 -------------------
 2 files changed, 3 insertions(+), 27 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/fscryptctl/install.patch

diff --git a/pkgs/os-specific/linux/fscryptctl/default.nix b/pkgs/os-specific/linux/fscryptctl/default.nix
index 81cd95332c81..8622dc001a87 100644
--- a/pkgs/os-specific/linux/fscryptctl/default.nix
+++ b/pkgs/os-specific/linux/fscryptctl/default.nix
@@ -4,19 +4,17 @@
 
 stdenv.mkDerivation rec {
   name = "fscryptctl-unstable-${version}";
-  version = "2017-09-12";
+  version = "2017-10-23";
 
   goPackagePath = "github.com/google/fscrypt";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "fscryptctl";
-    rev = "f037dcf4354ce8f25d0f371b58dfe7a7ac27576f";
-    sha256 = "1dw1y6jbm2ibn7npvpw6cl28rcz0jz4as2yl6walz7ppmqbj9scf";
+    rev = "142326810eb19d6794793db6d24d0775a15aa8e5";
+    sha256 = "1853hlpklisbqnkb7a921dsf0vp2nr2im26zpmrs592cnpsvk3hb";
   };
 
-  patches = [ ./install.patch ];
-
   makeFlags = [ "DESTDIR=$(out)/bin" ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/os-specific/linux/fscryptctl/install.patch b/pkgs/os-specific/linux/fscryptctl/install.patch
deleted file mode 100644
index 11f9843bbfb0..000000000000
--- a/pkgs/os-specific/linux/fscryptctl/install.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/Makefile	2017-09-24 22:48:19.322116085 +0200
-+++ b/Makefile	2017-09-24 22:50:07.655725022 +0200
-@@ -19,7 +19,7 @@
- CFLAGS += -O2 -Wall
- 
- INSTALL = install
--DESTDIR = /usr/local/bin
-+DESTDIR ?= /usr/local/bin
- 
- OBJECTS = $(NAME).o sha512.o
- 
-@@ -38,8 +38,8 @@
- 	@python -m pytest test.py -s -q
- 
- install: $(NAME)
--	$(INSTALL) -d $(DEST_DIR)
--	$(INSTALL) $(NAME) $(DEST_DIR)
-+	$(INSTALL) -d $(DESTDIR)
-+	$(INSTALL) $(NAME) $(DESTDIR)
- 
- clean:
- 	rm -f $(OBJECTS)