From eee16f8ecc977f1848b77964720790b50f3fca55 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Wed, 30 May 2018 16:11:41 +0000 Subject: [PATCH] flann: fix build with cmake 3.11 after #40800 --- pkgs/development/libraries/flann/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) 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 = {