git.iko.soy/typeable/nixpkgs
on master help sign in
python.pkgs.pybullet: 2.6.1 -> 2.6.6

Update static-libs.patch Add numpy to pybullet propagatedBuildInputs Added numpy to build inputs

commit74f312e042c3fc77343c5334322dd92bb47077bf authorMichael Lingelbach <m.j.lbach@gmail.com> dateSat 22 Feb 2020, 19:06 (7 years ago) parenteda0511
2 files changed+10−7
pkgs/development/python-modules/pybullet/default.nix+5−2 pkgs/development/python-modules/pybullet/static-libs.patch+5−5
pkgs/development/python-modules/pybullet/default.nix+5−2
@@ -3,15 +3,16 @@
33, fetchPypi
44, libGLU, libGL
55, xorg
6+, numpy
67}:
78
89buildPythonPackage rec {
910 pname = "pybullet";
10− version = "2.6.1";
11+ version = "2.6.6";
1112
1213 src = fetchPypi {
1314 inherit pname version;
14− sha256 = "c6da064687ae481c73b744b9f3a62d8231349a6bf368d7a2e564f71ef73e9403";
15+ sha256 = "1lsvjqij1vb9w8j6lvnq7lppflc7svz4cj37n74q67mb46gq3dxr";
1516 };
1617
1718 buildInputs = [
@@ -19,6 +20,8 @@ buildPythonPackage rec {
1920 xorg.libX11
2021 ];
2122
23+ propagatedBuildInputs = [ numpy ];
24+
2225 patches = [
2326 # make sure X11 and OpenGL can be found at runtime
2427 ./static-libs.patch
pkgs/development/python-modules/pybullet/static-libs.patch+5−5
@@ -1,13 +1,13 @@
11diff --git a/setup.py b/setup.py
2−index 98efabdbf..e69e79084 100644
2+index 6f7bd7589..321fc6ab0 100644
33--- a/setup.py
44+++ b/setup.py
5−@@ -563,6 +563,8 @@ print("-----")
5+@@ -465,6 +465,8 @@ print("-----")
66
77 extensions = []
88
99+libraries += [ "X11", "GL" ] # statically link x11 and opengl
1010+
11− pybullet_ext = Extension("pybullet",
12− sources = sources,
13− libraries = libraries,
11+ pybullet_ext = Extension(
12+ "pybullet",
13+ sources=sources,