Commit 2397b818 authored by Guilhem Saurel's avatar Guilhem Saurel
Browse files

pinocchio: 2.7.0 -> 2.7.1

parent 6bc8c8a7

pkgs/development/libraries/pinocchio/default.nix

+8 −9
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 
, boost

, eigen

, collisionSupport ? !stdenv.isDarwin

, jrl-cmakemodules

, hpp-fcl

, urdfdom

, pythonSupport ? false
@@ -13,14 +14,13 @@ 


stdenv.mkDerivation (finalAttrs: {

  pname = "pinocchio";

  version = "2.7.0";

  version = "2.7.1";



  src = fetchFromGitHub {

    owner = "stack-of-tasks";

    repo = finalAttrs.pname;

    rev = "v${finalAttrs.version}";

    fetchSubmodules = true;

    hash = "sha256-yhrG+MilGJkvwLUNTAgNhDqUWGjPswjrbg38yOLsmHc=";

    hash = "sha256-Ks5dvKi5iutjM+iovDOYGx3vsr45JWRqGOXV8+Ko4gg=";

  };



  strictDeps = true;
@@ -30,6 +30,7 @@ stdenv.mkDerivation (finalAttrs: { 
  ];



  propagatedBuildInputs = [

    jrl-cmakemodules

    urdfdom

  ] ++ lib.optionals (!pythonSupport) [

    boost
@@ -43,15 +44,13 @@ stdenv.mkDerivation (finalAttrs: { 
    python3Packages.hpp-fcl

  ];



  cmakeFlags = lib.optionals collisionSupport [

    "-DBUILD_WITH_COLLISION_SUPPORT=ON"

  ] ++ lib.optionals pythonSupport [

    "-DBUILD_WITH_LIBPYTHON=ON"

  cmakeFlags = [

    (lib.cmakeBool "BUILD_PYTHON_INTERFACE" pythonSupport)

    (lib.cmakeBool "BUILD_WITH_LIBPYTHON" pythonSupport)

    (lib.cmakeBool "BUILD_WITH_COLLISION_SUPPORT" collisionSupport)

  ] ++ lib.optionals (pythonSupport && stdenv.isDarwin) [

    # AssertionError: '.' != '/tmp/nix-build-pinocchio-2.7.0.drv/sou[84 chars].dae'

    "-DCMAKE_CTEST_ARGUMENTS='--exclude-regex;test-py-bindings_geometry_model_urdf'"

  ] ++ lib.optionals (!pythonSupport) [

    "-DBUILD_PYTHON_INTERFACE=OFF"

  ];



  doCheck = true;