diff options
| author | Anthony Cowley <acowley@gmail.com> | 2017-08-08 12:18:16 -0400 |
|---|---|---|
| committer | Anthony Cowley <acowley@gmail.com> | 2017-08-08 12:19:21 -0400 |
| commit | 7cdf149fab0dda14b2c11d81e4f440176e3334b7 (patch) | |
| tree | 660c23611413f2c335a074680f14c8f52b303feb | |
| parent | d6c510927651edefc5d5a5ef7070a39dfc94144e (diff) | |
| download | nixpkgs-7cdf149fab0dda14b2c11d81e4f440176e3334b7.tar nixpkgs-7cdf149fab0dda14b2c11d81e4f440176e3334b7.tar.gz nixpkgs-7cdf149fab0dda14b2c11d81e4f440176e3334b7.tar.bz2 nixpkgs-7cdf149fab0dda14b2c11d81e4f440176e3334b7.tar.lz nixpkgs-7cdf149fab0dda14b2c11d81e4f440176e3334b7.tar.xz nixpkgs-7cdf149fab0dda14b2c11d81e4f440176e3334b7.tar.zst nixpkgs-7cdf149fab0dda14b2c11d81e4f440176e3334b7.zip | |
flann: 1.8.4 -> 1.9.1
This should also fix the darwin build on hydra.
| -rw-r--r-- | pkgs/development/libraries/flann/default.nix | 15 | ||||
| -rw-r--r-- | pkgs/development/libraries/flann/no-examples.patch | 10 |
2 files changed, 7 insertions, 18 deletions
diff --git a/pkgs/development/libraries/flann/default.nix b/pkgs/development/libraries/flann/default.nix index 145d2b42a9d..eda18bc432c 100644 --- a/pkgs/development/libraries/flann/default.nix +++ b/pkgs/development/libraries/flann/default.nix @@ -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; diff --git a/pkgs/development/libraries/flann/no-examples.patch b/pkgs/development/libraries/flann/no-examples.patch deleted file mode 100644 index 95a6f0eed8e..00000000000 --- a/pkgs/development/libraries/flann/no-examples.patch +++ /dev/null @@ -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 ) |