flann: refactor (#129491)
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
This commit is contained in:
parent
dc3e28e753
commit
64f7cb574a
|
@ -1,24 +1,65 @@
|
||||||
{ lib, stdenv, fetchFromGitHub, fetchpatch, unzip, cmake, python }:
|
{ lib
|
||||||
|
, cmake
|
||||||
|
, fetchFromGitHub
|
||||||
|
, fetchpatch
|
||||||
|
, lz4
|
||||||
|
, pkg-config
|
||||||
|
, python3
|
||||||
|
, stdenv
|
||||||
|
, unzip
|
||||||
|
, enablePython ? false
|
||||||
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation rec {
|
||||||
name = "flann-1.9.1";
|
pname = "flann";
|
||||||
|
version = "1.9.1";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "mariusmuja";
|
owner = "flann-lib";
|
||||||
repo = "flann";
|
repo = "flann";
|
||||||
rev = "1.9.1";
|
rev = version;
|
||||||
sha256 = "13lg9nazj5s9a41j61vbijy04v6839i67lqd925xmxsbybf36gjc";
|
sha256 = "13lg9nazj5s9a41j61vbijy04v6839i67lqd925xmxsbybf36gjc";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
# Upstream issue: https://github.com/mariusmuja/flann/issues/369
|
# Patch HDF5_INCLUDE_DIR -> HDF_INCLUDE_DIRS.
|
||||||
(fetchpatch {
|
(fetchpatch {
|
||||||
url = "https://raw.githubusercontent.com/buildroot/buildroot/45a39b3e2ba42b72d19bfcef30db1b8da9ead51a/package/flann/0001-src-cpp-fix-cmake-3.11-build.patch";
|
url = "https://salsa.debian.org/science-team/flann/-/raw/debian/1.9.1+dfsg-9/debian/patches/0001-Updated-fix-cmake-hdf5.patch";
|
||||||
sha256 = "1gmj06cmnqvwxx649mxaivd35727wj6w7710zbcmmgmsnyfh2js4";
|
sha256 = "yM1ONU4mu6lctttM5YcSTg8F344TNUJXwjxXLqzr5Pk=";
|
||||||
|
})
|
||||||
|
# Patch no-source library workaround that breaks on CMake > 3.11.
|
||||||
|
(fetchpatch {
|
||||||
|
url = "https://salsa.debian.org/science-team/flann/-/raw/debian/1.9.1+dfsg-9/debian/patches/0001-src-cpp-fix-cmake-3.11-build.patch";
|
||||||
|
sha256 = "REsBnbe6vlrZ+iCcw43kR5wy2o6q10RM73xjW5kBsr4=";
|
||||||
|
})
|
||||||
|
# Avoid the bundled version of LZ4 and instead use the system one.
|
||||||
|
(fetchpatch {
|
||||||
|
url = "https://salsa.debian.org/science-team/flann/-/raw/debian/1.9.1+dfsg-9/debian/patches/0003-Use-system-version-of-liblz4.patch";
|
||||||
|
sha256 = "xi+GyFn9PEjLgbJeAIEmsbp7ut9G9KIBkVulyT3nfsg=";
|
||||||
|
})
|
||||||
|
# Fix LZ4 string separator issue, see: https://github.com/flann-lib/flann/pull/480
|
||||||
|
(fetchpatch {
|
||||||
|
url = "https://github.com/flann-lib/flann/commit/25eb56ec78472bd419a121c6905095a793cf8992.patch";
|
||||||
|
sha256 = "qt8h576Gn8uR7+T9u9bEBIRz6e6AoTKpa1JfdZVvW9s=";
|
||||||
})
|
})
|
||||||
];
|
];
|
||||||
|
|
||||||
nativeBuildInputs = [ unzip cmake python ];
|
cmakeFlags = [
|
||||||
|
"-DBUILD_EXAMPLES:BOOL=OFF"
|
||||||
|
"-DBUILD_TESTS:BOOL=OFF"
|
||||||
|
"-DBUILD_MATLAB_BINDINGS:BOOL=OFF"
|
||||||
|
"-DBUILD_PYTHON_BINDINGS:BOOL=${if enablePython then "ON" else "OFF"}"
|
||||||
|
];
|
||||||
|
|
||||||
|
nativeBuildInputs = [
|
||||||
|
cmake
|
||||||
|
pkg-config
|
||||||
|
unzip
|
||||||
|
];
|
||||||
|
|
||||||
|
propagatedBuildInputs = [ lz4 ];
|
||||||
|
|
||||||
|
buildInputs = lib.optionals enablePython [ python3 ];
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
homepage = "http://people.cs.ubc.ca/~mariusm/flann/";
|
homepage = "http://people.cs.ubc.ca/~mariusm/flann/";
|
||||||
|
|
Loading…
Reference in a new issue