tjh.dev
nixpkgs mirror (for testing)
github.com/NixOS/nixpkgs
nix
python.pkgs.pybullet: 2.6.1 -> 2.6.6
Update static-libs.patch
Add numpy to pybullet propagatedBuildInputs
Added numpy to build inputs
authored by
Michael Lingelbach
and committed by
Jon
74f312e0
eda05110
+10
-7
+5
-2
pkgs/development/python-modules/pybullet/default.nix
+5
-2
pkgs/development/python-modules/pybullet/default.nix
···
3
3
, fetchPypi
4
4
, libGLU, libGL
5
5
, xorg
6
+
, numpy
6
7
}:
7
8
8
9
buildPythonPackage rec {
9
10
pname = "pybullet";
10
-
version = "2.6.1";
11
+
version = "2.6.6";
11
12
12
13
src = fetchPypi {
13
14
inherit pname version;
14
-
sha256 = "c6da064687ae481c73b744b9f3a62d8231349a6bf368d7a2e564f71ef73e9403";
15
+
sha256 = "1lsvjqij1vb9w8j6lvnq7lppflc7svz4cj37n74q67mb46gq3dxr";
15
16
};
16
17
17
18
buildInputs = [
18
19
libGLU libGL
19
20
xorg.libX11
20
21
];
22
+
23
+
propagatedBuildInputs = [ numpy ];
21
24
22
25
patches = [
23
26
# make sure X11 and OpenGL can be found at runtime
+5
-5
pkgs/development/python-modules/pybullet/static-libs.patch
+5
-5
pkgs/development/python-modules/pybullet/static-libs.patch
···
1
1
diff --git a/setup.py b/setup.py
2
-
index 98efabdbf..e69e79084 100644
2
+
index 6f7bd7589..321fc6ab0 100644
3
3
--- a/setup.py
4
4
+++ b/setup.py
5
-
@@ -563,6 +563,8 @@ print("-----")
5
+
@@ -465,6 +465,8 @@ print("-----")
6
6
7
7
extensions = []
8
8
9
9
+libraries += [ "X11", "GL" ] # statically link x11 and opengl
10
10
+
11
-
pybullet_ext = Extension("pybullet",
12
-
sources = sources,
13
-
libraries = libraries,
11
+
pybullet_ext = Extension(
12
+
"pybullet",
13
+
sources=sources,