summary refs log tree commit diff
path: root/pkgs/development/libraries/flann
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/development/libraries/flann')
-rw-r--r--pkgs/development/libraries/flann/default.nix10
1 files changed, 9 insertions, 1 deletions
diff --git a/pkgs/development/libraries/flann/default.nix b/pkgs/development/libraries/flann/default.nix
index 3cc518fee50..a25f3ea04e2 100644
--- a/pkgs/development/libraries/flann/default.nix
+++ b/pkgs/development/libraries/flann/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, unzip, cmake, python }:
+{ stdenv, fetchFromGitHub, fetchpatch, unzip, cmake, python }:
 
 stdenv.mkDerivation {
   name = "flann-1.9.1";
@@ -10,6 +10,14 @@ stdenv.mkDerivation {
     sha256 = "13lg9nazj5s9a41j61vbijy04v6839i67lqd925xmxsbybf36gjc";
   };
 
+  patches = [
+    # Upstream issue: https://github.com/mariusmuja/flann/issues/369
+    (fetchpatch {
+      url = "https://raw.githubusercontent.com/buildroot/buildroot/45a39b3e2ba42b72d19bfcef30db1b8da9ead51a/package/flann/0001-src-cpp-fix-cmake-3.11-build.patch";
+      sha256 = "1gmj06cmnqvwxx649mxaivd35727wj6w7710zbcmmgmsnyfh2js4";
+    })
+  ];
+
   buildInputs = [ unzip cmake python ];
 
   meta = {