diff options
author | Guilhem Saurel <guilhem.saurel@laas.fr> | 2023-08-09 11:06:28 +0200 |
---|---|---|
committer | Guilhem Saurel <guilhem.saurel@laas.fr> | 2023-08-09 12:21:54 +0200 |
commit | 0c0b3af7936d868d5346f8e2fc46814ab0dfa4be (patch) | |
tree | f09aee33af54c1c977d5ca4b036976d964893c82 | |
parent | 703016656cc647e16e100cef7280961451869112 (diff) | |
download | nixpkgs-0c0b3af7936d868d5346f8e2fc46814ab0dfa4be.tar nixpkgs-0c0b3af7936d868d5346f8e2fc46814ab0dfa4be.tar.gz nixpkgs-0c0b3af7936d868d5346f8e2fc46814ab0dfa4be.tar.bz2 nixpkgs-0c0b3af7936d868d5346f8e2fc46814ab0dfa4be.tar.lz nixpkgs-0c0b3af7936d868d5346f8e2fc46814ab0dfa4be.tar.xz nixpkgs-0c0b3af7936d868d5346f8e2fc46814ab0dfa4be.tar.zst nixpkgs-0c0b3af7936d868d5346f8e2fc46814ab0dfa4be.zip |
pinocchio: 2.6.19 -> 2.6.20
While here: - add hpp-fcl dependency - enable libpython dependency when python support is activated - use finalAttrs instead of rec - add check & python import check - add myself in maintainers
-rw-r--r-- | pkgs/development/libraries/pinocchio/default.nix | 28 |
1 files changed, 20 insertions, 8 deletions
diff --git a/pkgs/development/libraries/pinocchio/default.nix b/pkgs/development/libraries/pinocchio/default.nix index ad3e3ba1299..6faf612c197 100644 --- a/pkgs/development/libraries/pinocchio/default.nix +++ b/pkgs/development/libraries/pinocchio/default.nix @@ -4,21 +4,22 @@ , cmake , boost , eigen +, hpp-fcl , urdfdom , pythonSupport ? false , python3Packages }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "pinocchio"; - version = "2.6.19"; + version = "2.6.20"; src = fetchFromGitHub { owner = "stack-of-tasks"; - repo = pname; - rev = "v${version}"; + repo = finalAttrs.pname; + rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-P7jSAQ6LYcboJHqtpneT4W8Pu5G3fd3/a8Gju9im1e8="; + hash = "sha256-Pu/trCpqdue7sQKDbLhyxTfgj/+xRiVcG7Luz6ZQXtM="; }; # error: use of undeclared identifier '__sincos' @@ -38,20 +39,31 @@ stdenv.mkDerivation rec { ] ++ lib.optionals (!pythonSupport) [ boost eigen + hpp-fcl ] ++ lib.optionals pythonSupport [ python3Packages.boost python3Packages.eigenpy + python3Packages.hpp-fcl ]; - cmakeFlags = lib.optionals (!pythonSupport) [ + cmakeFlags = [ + "-DBUILD_WITH_COLLISION_SUPPORT=ON" + ] ++ lib.optionals (pythonSupport) [ + "-DBUILD_WITH_LIBPYTHON=ON" + ] ++ lib.optionals (!pythonSupport) [ "-DBUILD_PYTHON_INTERFACE=OFF" ]; + doCheck = true; + pythonImportsCheck = lib.optionals (!pythonSupport) [ + "pinocchio" + ]; + meta = with lib; { description = "A fast and flexible implementation of Rigid Body Dynamics algorithms and their analytical derivatives"; homepage = "https://github.com/stack-of-tasks/pinocchio"; license = licenses.bsd2; - maintainers = with maintainers; [ wegank ]; + maintainers = with maintainers; [ nim65s wegank ]; platforms = platforms.unix; }; -} +}) |