about summary refs log tree commit diff
diff options
context:
space:
mode:
authorWeijia Wang <9713184+wegank@users.noreply.github.com>2024-04-06 01:47:57 +0200
committerGitHub <noreply@github.com>2024-04-06 01:47:57 +0200
commita3402282c5d499c39ebc3be51bdd04494f57eebd (patch)
tree0b756372ab3788ffa252a5f9dd190ff9f589bce8
parent43c12d323af6c7e7a9547fcd394f8e4d560dc994 (diff)
parent9d56bbe738a40d1ccbbcf3234eec770329c92393 (diff)
Merge pull request #300291 from wegank/libpointmatcher-bump
libpointmatcher: 1.3.1 -> 1.4.2
-rw-r--r--pkgs/development/libraries/libpointmatcher/default.nix20
1 files changed, 9 insertions, 11 deletions
diff --git a/pkgs/development/libraries/libpointmatcher/default.nix b/pkgs/development/libraries/libpointmatcher/default.nix
index 01c3e3e87e43f..92e1585373479 100644
--- a/pkgs/development/libraries/libpointmatcher/default.nix
+++ b/pkgs/development/libraries/libpointmatcher/default.nix
@@ -1,33 +1,31 @@
-{ lib, stdenv, fetchFromGitHub, cmake, eigen, boost, libnabo }:
+{ lib, stdenv, fetchFromGitHub, cmake, eigen, boost, libnabo, yaml-cpp }:
 
 stdenv.mkDerivation rec {
   pname = "libpointmatcher";
-  version = "1.3.1";
+  version = "1.4.2";
 
   src = fetchFromGitHub {
-    owner = "ethz-asl";
-    repo = pname;
+    owner = "norlab-ulaval";
+    repo = "libpointmatcher";
     rev = version;
-    sha256 = "0lai6sr3a9dj1j4pgjjyp7mx10wixy5wpvbka8nsc2danj6xhdyd";
+    hash = "sha256-XXkvBxG9f8rW1O968+2R+gltMSRGqH225vOmzp6Tpb8=";
   };
 
   nativeBuildInputs = [ cmake ];
-  buildInputs = [ eigen boost libnabo ];
+  buildInputs = [ eigen boost libnabo yaml-cpp ];
 
   cmakeFlags = [
-    "-DEIGEN_INCLUDE_DIR=${eigen}/include/eigen3"
+    (lib.cmakeFeature "EIGEN_INCLUDE_DIR" "${eigen}/include/eigen3")
+    (lib.cmakeBool "BUILD_TESTS" doCheck)
   ];
 
   doCheck = true;
-  checkPhase = ''
-    ./utest/utest --path ../examples/data/
-  '';
 
   meta = with lib; {
     inherit (src.meta) homepage;
     description = "An \"Iterative Closest Point\" library for 2-D/3-D mapping in robotic";
     license = licenses.bsd3;
-    platforms = [ "x86_64-linux" ];
+    platforms = platforms.linux;
     maintainers = with maintainers; [ cryptix ];
   };
 }