Unverified Commit cec619e0 authored by Pol Dellaiera's avatar Pol Dellaiera Committed by GitHub
Browse files

hpp-fcl: add missing dependency (#337549)

parents cb97dfe6 90a6f86d

pkgs/development/libraries/hpp-fcl/default.nix→pkgs/by-name/hp/hpp-fcl/package.nix

+81 −0
Original line number Diff line number Diff line 
{ lib

, stdenv

, fetchFromGitHub

, cmake

, doxygen

, boost

, eigen

, assimp

, octomap

, qhull

, pythonSupport ? false

, python3Packages

{

  lib,

  stdenv,

  fetchFromGitHub,

  cmake,

  doxygen,

  boost,

  eigen,

  assimp,

  octomap,

  qhull,

  pythonSupport ? false,

  python3Packages,

  zlib,

}:



stdenv.mkDerivation (finalAttrs: {
@@ -29,46 +31,51 @@ stdenv.mkDerivation (finalAttrs: { 
  nativeBuildInputs = [

    cmake

    doxygen

  ] ++ lib.optionals pythonSupport [

    python3Packages.numpy

  ];

  ] ++ lib.optionals pythonSupport [ python3Packages.numpy ];



  propagatedBuildInputs = [

  propagatedBuildInputs =

    [

      assimp

      qhull

      octomap

  ] ++ lib.optionals (!pythonSupport) [

      zlib

    ]

    ++ lib.optionals (!pythonSupport) [

      boost

      eigen

  ] ++ lib.optionals pythonSupport [

    ]

    ++ lib.optionals pythonSupport [

      python3Packages.boost

      python3Packages.eigenpy

    ];



  cmakeFlags = [

    "-DHPP_FCL_HAS_QHULL=ON"

    "-DINSTALL_DOCUMENTATION=ON"

  ] ++ lib.optionals (!pythonSupport) [

    "-DBUILD_PYTHON_INTERFACE=OFF"

    (lib.cmakeBool "HPP_FCL_HAS_QHULL" true)

    (lib.cmakeBool "INSTALL_DOCUMENTATION" true)

    (lib.cmakeBool "BUILD_PYTHON_INTERFACE" pythonSupport)

  ];



  doCheck = true;

  pythonImportsCheck = lib.optionals (!pythonSupport) [

    "hppfcl"

  ];

  # pythonImportsCheck, but in stdenv.mkDerivation

  postInstall = lib.optionalString pythonSupport ''

    PYTHONPATH=$out/${python3Packages.python.sitePackages}:$PYTHONPATH

    python -c "import hppfcl"

  '';



  outputs = [ "dev" "out" "doc" ];

  outputs = [

    "dev"

    "out"

    "doc"

  ];

  postFixup = ''

    moveToOutput share/ament_index "$dev"

    moveToOutput share/${finalAttrs.pname} "$dev"

  '';





  meta = with lib; {

  meta = {

    description = "Extension of the Flexible Collision Library";

    homepage = "https://github.com/humanoid-path-planner/hpp-fcl";

    license = licenses.bsd3;

    maintainers = with maintainers; [ nim65s ];

    platforms = platforms.unix;

    license = lib.licenses.bsd3;

    maintainers = with lib.maintainers; [ nim65s ];

  };

})

pkgs/top-level/all-packages.nix

+0 −2
Original line number Diff line number Diff line
@@ -20686,8 +20686,6 @@ with pkgs; 














  hound = callPackage ../development/tools/misc/hound { };



























  hpp-fcl = callPackage ../development/libraries/hpp-fcl { };



























  hpx = callPackage ../development/libraries/hpx {















    boost = boost179;















    asio = asio.override { boost = boost179; };