Merge pull request #104647 from lopsided98/pykdl-fix

pythonPackages.pykdl: fix build with latest SIP
This commit is contained in:
Mario Rodas 2020-12-05 22:40:39 -05:00 committed by GitHub
commit d0751daf37
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1,9 +1,19 @@
{ lib, stdenv, toPythonModule, cmake, orocos-kdl, python, sip }:
{ lib, stdenv, toPythonModule, fetchpatch, cmake, orocos-kdl, python, sip }:
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";
nativeBuildInputs = [ cmake ];