diff options
| author | Orivej Desh <orivej@gmx.fr> | 2018-05-30 16:11:41 +0000 |
|---|---|---|
| committer | Orivej Desh <orivej@gmx.fr> | 2018-05-30 16:11:41 +0000 |
| commit | eee16f8ecc977f1848b77964720790b50f3fca55 (patch) | |
| tree | 8de45e21598d06d7627ad91a9ea624bc072872ed /pkgs/development/libraries/flann | |
| parent | 6c00639417d3da7869cf2aa3a23274d783df4465 (diff) | |
| download | nixpkgs-eee16f8ecc977f1848b77964720790b50f3fca55.tar nixpkgs-eee16f8ecc977f1848b77964720790b50f3fca55.tar.gz nixpkgs-eee16f8ecc977f1848b77964720790b50f3fca55.tar.bz2 nixpkgs-eee16f8ecc977f1848b77964720790b50f3fca55.tar.lz nixpkgs-eee16f8ecc977f1848b77964720790b50f3fca55.tar.xz nixpkgs-eee16f8ecc977f1848b77964720790b50f3fca55.tar.zst nixpkgs-eee16f8ecc977f1848b77964720790b50f3fca55.zip | |
flann: fix build with cmake 3.11 after #40800
Diffstat (limited to 'pkgs/development/libraries/flann')
| -rw-r--r-- | pkgs/development/libraries/flann/default.nix | 10 |
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 = { |