ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-29 06:45:54 +03:00
Code Issues Projects Releases Wiki Activity

flann: 1.8.4 -> 1.9.1

Browse Source 
This should also fix the darwin build on hydra.
This commit is contained in:
Anthony Cowley 2017-08-08 12:18:16 -04:00
parent d6c5109276
commit 7cdf149fab
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 { stdenv.mkDerivation {
name = "flann-1.8.4"; name = "flann-1.9.1";
src = fetchurl { src = fetchFromGitHub {
url = http://people.cs.ubc.ca/~mariusm/uploads/FLANN/flann-1.8.4-src.zip; owner = "mariusmuja";
sha256 = "022w8hph7bli5zbpnk3z1qh1c2sl5hm8fw2ccim651ynn0hr7fyz"; repo = "flann";
rev = "1.9.1";
sha256 = "13lg9nazj5s9a41j61vbijy04v6839i67lqd925xmxsbybf36gjc";
}; };
buildInputs = [ unzip cmake python ]; buildInputs = [ unzip cmake python ];
# patch out examples in Darwin because they do not compile.
patches = stdenv.lib.optionals stdenv.isDarwin [ ./no-examples.patch ];
meta = { meta = {
homepage = http://people.cs.ubc.ca/~mariusm/flann/; homepage = http://people.cs.ubc.ca/~mariusm/flann/;
license = stdenv.lib.licenses.bsd3; 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 )