diff options
| author | Alyssa Ross <hi@alyssa.is> | 2019-05-17 10:56:54 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2019-05-17 10:56:54 +0000 |
| commit | c1d22074139ab0d048a05b5e5116265d099114d6 (patch) | |
| tree | 97977009422d675f8930f97c309b010481289e72 /nixpkgs/pkgs/development/libraries/libpointmatcher | |
| parent | 4dc8afe4fd6b18437150129e0a1ecc23c6a1c0b9 (diff) | |
| parent | bc9df0f66110039e495b6debe3a6cda4a1bb0fed (diff) | |
| download | nixlib-c1d22074139ab0d048a05b5e5116265d099114d6.tar nixlib-c1d22074139ab0d048a05b5e5116265d099114d6.tar.gz nixlib-c1d22074139ab0d048a05b5e5116265d099114d6.tar.bz2 nixlib-c1d22074139ab0d048a05b5e5116265d099114d6.tar.lz nixlib-c1d22074139ab0d048a05b5e5116265d099114d6.tar.xz nixlib-c1d22074139ab0d048a05b5e5116265d099114d6.tar.zst nixlib-c1d22074139ab0d048a05b5e5116265d099114d6.zip | |
Merge commit 'bc9df0f66110039e495b6debe3a6cda4a1bb0fed'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/libpointmatcher')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/libpointmatcher/default.nix | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/nixpkgs/pkgs/development/libraries/libpointmatcher/default.nix b/nixpkgs/pkgs/development/libraries/libpointmatcher/default.nix index 2b8fc1fcc8f7..cd841a9d8f84 100644 --- a/nixpkgs/pkgs/development/libraries/libpointmatcher/default.nix +++ b/nixpkgs/pkgs/development/libraries/libpointmatcher/default.nix @@ -1,17 +1,18 @@ -{stdenv, fetchFromGitHub, cmake, eigen, boost, libnabo}: +{ stdenv, fetchFromGitHub, cmake, eigen, boost, libnabo }: stdenv.mkDerivation rec { - version = "2016-09-11"; - name = "libpointmatcher-${version}"; + pname = "libpointmatcher"; + version = "1.3.1"; src = fetchFromGitHub { owner = "ethz-asl"; - repo = "libpointmatcher"; - rev = "75044815d40ff934fe0bb7e05ed8bbf18c06493b"; - sha256 = "1s7ilvg3lhr1fq8sxw05ydmbd3kl46496jnyxprhnpgvpmvqsbzl"; + repo = pname; + rev = version; + sha256 = "0lai6sr3a9dj1j4pgjjyp7mx10wixy5wpvbka8nsc2danj6xhdyd"; }; - buildInputs = [cmake eigen boost libnabo]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ eigen boost libnabo ]; enableParallelBuilding = true; @@ -19,11 +20,11 @@ stdenv.mkDerivation rec { -DEIGEN_INCLUDE_DIR=${eigen}/include/eigen3 "; + doCheck = true; checkPhase = '' - export LD_LIBRARY_PATH=$PWD - ./utest/utest --path ../examples/data/ + export LD_LIBRARY_PATH=$PWD + ./utest/utest --path ../examples/data/ ''; - doCheck = true; meta = with stdenv.lib; { inherit (src.meta) homepage; |