python.pkgs.pybullet: 2.6.1 -> 2.6.6

Update static-libs.patch

Add numpy to pybullet propagatedBuildInputs

Added numpy to build inputs
This commit is contained in:
Michael Lingelbach 2020-02-22 19:06:28 -08:00 committed by Jon
parent eda05110a0
commit 74f312e042
2 changed files with 10 additions and 7 deletions

View File

@ -3,15 +3,16 @@
, fetchPypi
, libGLU, libGL
, xorg
, numpy
}:
buildPythonPackage rec {
pname = "pybullet";
version = "2.6.1";
version = "2.6.6";
src = fetchPypi {
inherit pname version;
sha256 = "c6da064687ae481c73b744b9f3a62d8231349a6bf368d7a2e564f71ef73e9403";
sha256 = "1lsvjqij1vb9w8j6lvnq7lppflc7svz4cj37n74q67mb46gq3dxr";
};
buildInputs = [
@ -19,6 +20,8 @@ buildPythonPackage rec {
xorg.libX11
];
propagatedBuildInputs = [ numpy ];
patches = [
# make sure X11 and OpenGL can be found at runtime
./static-libs.patch

View File

@ -1,13 +1,13 @@
diff --git a/setup.py b/setup.py
index 98efabdbf..e69e79084 100644
index 6f7bd7589..321fc6ab0 100644
--- a/setup.py
+++ b/setup.py
@@ -563,6 +563,8 @@ print("-----")
@@ -465,6 +465,8 @@ print("-----")
extensions = []
+libraries += [ "X11", "GL" ] # statically link x11 and opengl
+
pybullet_ext = Extension("pybullet",
sources = sources,
libraries = libraries,
pybullet_ext = Extension(
"pybullet",
sources=sources,