Merge pull request #232854 from nim65s/master (dbfcf5c9) · Commits · nix / nixpkgs

maintainers/maintainer-list.nix

+10 −0

Original line number	Diff line number	Diff line
		@@ -11461,6 +11461,16 @@
		githubId = 26231126;
		name = "Nils ANDRÉ-CHANG";
		};
		nim65s = {
		email = "guilhem.saurel@laas.fr";
		matrix = "@gsaurel:laas.fr";
		github = "nim65s";
		githubId = 131929;
		name = "Guilhem Saurel";
		keys = [{
		fingerprint = "9B1A 7906 5D2F 2B80 6C8A 5A1C 7D2A CDAF 4653 CF28";
		}];
		};
		ninjatrappeur = {
		email = "felix@alternativebit.fr";
		matrix = "@ninjatrappeur:matrix.org";

0 → 100644

+72 −0

Original line number	Diff line number	Diff line
		{ lib
		, stdenv
		, fetchFromGitHub
		, fetchpatch
		, cmake
		, boost
		, eigen
		, assimp
		, octomap
		, qhull
		, pythonSupport ? false
		, python3Packages
		}:

		stdenv.mkDerivation (finalAttrs: {
		pname = "hpp-fcl";
		version = "2.3.3";

		src = fetchFromGitHub {
		owner = "humanoid-path-planner";
		repo = finalAttrs.pname;
		rev = "v${finalAttrs.version}";
		fetchSubmodules = true;
		hash = "sha256-7MXQ5+S/lvaTBVGY2gTJ1nUegtf9cp7p0JLJ4oPJAUY=";
		};

		patches = [
		# Fix unittest where nix env set `boost::archive::tmpdir()` to `/build` and trigger a path concatenation bug.
		(fetchpatch {
		name = "tests-use-boost-filesystem.patch";
		url = "https://github.com/humanoid-path-planner/hpp-fcl/commit/7e8fde64a5d2c2412325f6cb5d78623bf2409176.patch";
		hash = "sha256-YjESkj8SqYiyrJuXIa5mSnHIph/D04J10poTDcYgs2c=";
		})
		];

		strictDeps = true;

		nativeBuildInputs = [
		cmake
		];

		propagatedBuildInputs = [
		assimp
		qhull
		octomap
		] ++ lib.optionals (!pythonSupport) [
		boost
		eigen
		] ++ lib.optionals pythonSupport [
		python3Packages.boost
		python3Packages.eigenpy
		];

		cmakeFlags = [
		"-DHPP_FCL_HAS_QHULL=ON"
		] ++ lib.optionals (!pythonSupport) [
		"-DBUILD_PYTHON_INTERFACE=OFF"
		];

		doCheck = true;
		pythonImportsCheck = lib.optionals (!pythonSupport) [
		"hppfcl"
		];

		meta = with lib; {
		description = "An 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;
		};
		})

+2 −0

Original line number	Diff line number	Diff line
		@@ -21127,6 +21127,8 @@ with pkgs;

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

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

		hpx = callPackage ../development/libraries/hpx {
		boost = boost17x;
		asio = asio.override { boost = boost17x; };

+5 −0

Original line number	Diff line number	Diff line
		@@ -4627,6 +4627,11 @@ self: super: with self; {

		hpccm = callPackage ../development/python-modules/hpccm { };

		hpp-fcl = toPythonModule (pkgs.hpp-fcl.override {
		pythonSupport = true;
		python3Packages = self;
		});

		hs-dbus-signature = callPackage ../development/python-modules/hs-dbus-signature { };

		hsaudiotag3k = callPackage ../development/python-modules/hsaudiotag3k { };