swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-22 05:19:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #28043 from acowley/flann-1.9.1

Browse source 
flann: 1.8.4 -> 1.9.1
This commit is contained in:
Jörg Thalheim 2017-08-12 08:55:29 +01:00 committed by GitHub
parent 79694b52ce 7cdf149fab
commit 1ce1ddfc83
2 changed files with 7 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
pkgs/development/libraries/flann/default.nix
View file

@ -1,18 +1,17 @@
{stdenv, fetchurl, unzip, cmake, python}:
{stdenv, fetchFromGitHub, unzip, cmake, python}:
stdenv.mkDerivation {
name = "flann-1.8.4";
name = "flann-1.9.1";
src = fetchurl {
url = http://people.cs.ubc.ca/~mariusm/uploads/FLANN/flann-1.8.4-src.zip;
sha256 = "022w8hph7bli5zbpnk3z1qh1c2sl5hm8fw2ccim651ynn0hr7fyz";
src = fetchFromGitHub {
owner = "mariusmuja";
repo = "flann";
rev = "1.9.1";
sha256 = "13lg9nazj5s9a41j61vbijy04v6839i67lqd925xmxsbybf36gjc";
};
buildInputs = [ unzip cmake python ];
# patch out examples in Darwin because they do not compile.
patches = stdenv.lib.optionals stdenv.isDarwin [ ./no-examples.patch ];
meta = {
homepage = http://people.cs.ubc.ca/~mariusm/flann/;
license = stdenv.lib.licenses.bsd3;

10
pkgs/development/libraries/flann/no-examples.patch
View file

@ -1,10 +0,0 @@
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -155,7 +155,7 @@
add_subdirectory( cmake )
add_subdirectory( src )
-add_subdirectory( examples )
+#add_subdirectory( examples )
add_subdirectory( test )
add_subdirectory( doc )