dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

orocos-kdl: 1.4.0 -> 1.5.0

Browse Source
This commit is contained in:
Ben Wolsieffer 2021-06-13 18:00:13 -04:00 committed by Jonathan Ringer
parent fdc3bf4178
commit 2804657c2b
2 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/libraries/orocos-kdl/default.nix
View File

@ -2,13 +2,15 @@
stdenv.mkDerivation rec {
pname = "orocos-kdl";
version = "1.4.0";
version = "1.5.0";
src = fetchFromGitHub {
owner = "orocos";
repo = "orocos_kinematics_dynamics";
rev = "v${version}";
sha256 = "0qj56j231h0rnjbglakammxn2lwmhy5f2qa37v1f6pcn81dn13vv";
sha256 = "181w2q6lsrfcvrgqwi6m0xrydjlblj1b654apf2d7zjc7qqgd6ca";
# Needed to build Python bindings
fetchSubmodules = true;
};
sourceRoot = "source/orocos_kdl";

22
pkgs/development/python-modules/pykdl/default.nix
View File

@ -1,24 +1,20 @@
{ lib, stdenv, toPythonModule, fetchpatch, cmake, orocos-kdl, python, sip_4 }:
{ lib, stdenv, toPythonModule, cmake, orocos-kdl, eigen, python }:
toPythonModule (stdenv.mkDerivation {
pname = "pykdl";
inherit (orocos-kdl) version src;
patches = [
# Fix build with SIP 4.19.23+. Can be removed with version 1.5.
# https://github.com/orocos/orocos_kinematics_dynamics/pull/270
(fetchpatch {
url = "https://github.com/orocos/orocos_kinematics_dynamics/commit/d8d087ad0e1c41f3489d1a255ebfa27b5695196b.patch";
sha256 = "0qyskqxv4a982kidzzyh34xj2iiw791ipbbl29jg4qb4l21xwqlg";
stripLen = 1;
})
];
sourceRoot = "source/python_orocos_kdl";
# Fix hardcoded installation path
postPatch = ''
substituteInPlace CMakeLists.txt \
--replace dist-packages site-packages
'';
nativeBuildInputs = [ cmake ];
buildInputs = [ orocos-kdl ];
propagatedBuildInputs = [ python sip_4 ];
buildInputs = [ orocos-kdl eigen ];
propagatedBuildInputs = [ python ];
meta = with lib; {
description = "Kinematics and Dynamics Library (Python bindings)";