From 9801e42a29260d1633c7d95323c8ba8e6d118c76 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 7 Mar 2024 01:05:58 +0000 Subject: [PATCH 1/2] hpp-fcl: 2.4.1 -> 2.4.4 --- pkgs/development/libraries/hpp-fcl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/hpp-fcl/default.nix b/pkgs/development/libraries/hpp-fcl/default.nix index c91d3cbaac4f..818d66189dbe 100644 --- a/pkgs/development/libraries/hpp-fcl/default.nix +++ b/pkgs/development/libraries/hpp-fcl/default.nix @@ -14,14 +14,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "hpp-fcl"; - version = "2.4.1"; + version = "2.4.4"; src = fetchFromGitHub { owner = "humanoid-path-planner"; repo = finalAttrs.pname; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-Suow6dvDZI0uS/CkzfkWIxYjn+i4Fbyd2EnqlxM2gMY="; + hash = "sha256-BwS9RSirdlD6Cqwp7KD59dkh2WsJVwdlH9LzM2AFjI4="; }; strictDeps = true; From 7f64c11d9183bdd06536520f95cbcadeddab22cc Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Thu, 7 Mar 2024 12:02:45 +0100 Subject: [PATCH 2/2] hpp-fcl: add doc & split outputs --- pkgs/development/libraries/hpp-fcl/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/development/libraries/hpp-fcl/default.nix b/pkgs/development/libraries/hpp-fcl/default.nix index 818d66189dbe..59bf04f72609 100644 --- a/pkgs/development/libraries/hpp-fcl/default.nix +++ b/pkgs/development/libraries/hpp-fcl/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , fetchpatch , cmake +, doxygen , boost , eigen , assimp @@ -28,6 +29,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake + doxygen ]; propagatedBuildInputs = [ @@ -44,6 +46,7 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ "-DHPP_FCL_HAS_QHULL=ON" + "-DINSTALL_DOCUMENTATION=ON" ] ++ lib.optionals (!pythonSupport) [ "-DBUILD_PYTHON_INTERFACE=OFF" ]; @@ -53,6 +56,13 @@ stdenv.mkDerivation (finalAttrs: { "hppfcl" ]; + outputs = [ "dev" "out" "doc" ]; + postFixup = '' + moveToOutput share/ament_index "$dev" + moveToOutput share/${finalAttrs.pname} "$dev" + ''; + + meta = with lib; { description = "An extension of the Flexible Collision Library"; homepage = "https://github.com/humanoid-path-planner/hpp-fcl";