From 7cdf149fab0dda14b2c11d81e4f440176e3334b7 Mon Sep 17 00:00:00 2001
From: Anthony Cowley <acowley@gmail.com>
Date: Tue, 8 Aug 2017 12:18:16 -0400
Subject: [PATCH] flann: 1.8.4 -> 1.9.1

This should also fix the darwin build on hydra.
---
 pkgs/development/libraries/flann/default.nix      | 15 +++++++--------
 .../development/libraries/flann/no-examples.patch | 10 ----------
 2 files changed, 7 insertions(+), 18 deletions(-)
 delete mode 100644 pkgs/development/libraries/flann/no-examples.patch

diff --git a/pkgs/development/libraries/flann/default.nix b/pkgs/development/libraries/flann/default.nix
index 145d2b42a9db..eda18bc432c2 100644
--- a/pkgs/development/libraries/flann/default.nix
+++ b/pkgs/development/libraries/flann/default.nix
@@ -1,18 +1,17 @@
-{stdenv, fetchurl, unzip, cmake, python}:
+{stdenv, fetchFromGitHub, unzip, cmake, python}:
 
 stdenv.mkDerivation {
-  name = "flann-1.8.4";
+  name = "flann-1.9.1";
 
-  src = fetchurl {
-    url = http://people.cs.ubc.ca/~mariusm/uploads/FLANN/flann-1.8.4-src.zip;
-    sha256 = "022w8hph7bli5zbpnk3z1qh1c2sl5hm8fw2ccim651ynn0hr7fyz";
+  src = fetchFromGitHub {
+    owner = "mariusmuja";
+    repo = "flann";
+    rev = "1.9.1";
+    sha256 = "13lg9nazj5s9a41j61vbijy04v6839i67lqd925xmxsbybf36gjc";
   };
 
   buildInputs = [ unzip cmake python ];
 
-  # patch out examples in Darwin because they do not compile.
-  patches = stdenv.lib.optionals stdenv.isDarwin [ ./no-examples.patch ];
-
   meta = {
     homepage = http://people.cs.ubc.ca/~mariusm/flann/;
     license = stdenv.lib.licenses.bsd3;
diff --git a/pkgs/development/libraries/flann/no-examples.patch b/pkgs/development/libraries/flann/no-examples.patch
deleted file mode 100644
index 95a6f0eed8eb..000000000000
--- a/pkgs/development/libraries/flann/no-examples.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/CMakeLists.txt	
-+++ b/CMakeLists.txt	
-@@ -155,7 +155,7 @@
-
- add_subdirectory( cmake )
- add_subdirectory( src )
--add_subdirectory( examples )
-+#add_subdirectory( examples )
- add_subdirectory( test )
- add_subdirectory( doc )