public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

flann: fix build with cmake 3.11 after #40800

Browse Source
This commit is contained in:
Orivej Desh 2018-05-30 16:11:41 +00:00
parent 6c00639417
commit eee16f8ecc
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/libraries/flann/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, unzip, cmake, python }: { stdenv, fetchFromGitHub, fetchpatch, unzip, cmake, python }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "flann-1.9.1"; name = "flann-1.9.1";
@ -10,6 +10,14 @@ stdenv.mkDerivation {
sha256 = "13lg9nazj5s9a41j61vbijy04v6839i67lqd925xmxsbybf36gjc"; 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 ]; buildInputs = [ unzip cmake python ];
meta = { meta = {