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:
parent
eda05110a0
commit
74f312e042
@ -3,15 +3,16 @@
|
|||||||
, fetchPypi
|
, fetchPypi
|
||||||
, libGLU, libGL
|
, libGLU, libGL
|
||||||
, xorg
|
, xorg
|
||||||
|
, numpy
|
||||||
}:
|
}:
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "pybullet";
|
pname = "pybullet";
|
||||||
version = "2.6.1";
|
version = "2.6.6";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
sha256 = "c6da064687ae481c73b744b9f3a62d8231349a6bf368d7a2e564f71ef73e9403";
|
sha256 = "1lsvjqij1vb9w8j6lvnq7lppflc7svz4cj37n74q67mb46gq3dxr";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
@ -19,6 +20,8 @@ buildPythonPackage rec {
|
|||||||
xorg.libX11
|
xorg.libX11
|
||||||
];
|
];
|
||||||
|
|
||||||
|
propagatedBuildInputs = [ numpy ];
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
# make sure X11 and OpenGL can be found at runtime
|
# make sure X11 and OpenGL can be found at runtime
|
||||||
./static-libs.patch
|
./static-libs.patch
|
||||||
|
@ -1,13 +1,13 @@
|
|||||||
diff --git a/setup.py b/setup.py
|
diff --git a/setup.py b/setup.py
|
||||||
index 98efabdbf..e69e79084 100644
|
index 6f7bd7589..321fc6ab0 100644
|
||||||
--- a/setup.py
|
--- a/setup.py
|
||||||
+++ b/setup.py
|
+++ b/setup.py
|
||||||
@@ -563,6 +563,8 @@ print("-----")
|
@@ -465,6 +465,8 @@ print("-----")
|
||||||
|
|
||||||
extensions = []
|
extensions = []
|
||||||
|
|
||||||
+libraries += [ "X11", "GL" ] # statically link x11 and opengl
|
+libraries += [ "X11", "GL" ] # statically link x11 and opengl
|
||||||
+
|
+
|
||||||
pybullet_ext = Extension("pybullet",
|
pybullet_ext = Extension(
|
||||||
sources = sources,
|
"pybullet",
|
||||||
libraries = libraries,
|
sources=sources,
|
||||||
|
Loading…
x
Reference in New Issue
Block a user