diff options
author | Alyssa Ross <hi@alyssa.is> | 2020-04-01 15:50:50 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2020-04-01 15:50:50 +0000 |
commit | 75eafe97f7df0d653bec67f3962214d7c357831f (patch) | |
tree | 09f2cc901e0e637876cbb78d192dfe2fcfef8156 /nixpkgs/pkgs/development/python-modules/pybullet | |
parent | a53b121bf4331497da63df3b1b7f1a7897dad146 (diff) | |
parent | a2e06fc3423c4be53181b15c28dfbe0bcf67dd73 (diff) | |
download | nixlib-75eafe97f7df0d653bec67f3962214d7c357831f.tar nixlib-75eafe97f7df0d653bec67f3962214d7c357831f.tar.gz nixlib-75eafe97f7df0d653bec67f3962214d7c357831f.tar.bz2 nixlib-75eafe97f7df0d653bec67f3962214d7c357831f.tar.lz nixlib-75eafe97f7df0d653bec67f3962214d7c357831f.tar.xz nixlib-75eafe97f7df0d653bec67f3962214d7c357831f.tar.zst nixlib-75eafe97f7df0d653bec67f3962214d7c357831f.zip |
Merge commit 'a2e06fc3423c4be53181b15c28dfbe0bcf67dd73'
Diffstat (limited to 'nixpkgs/pkgs/development/python-modules/pybullet')
-rw-r--r-- | nixpkgs/pkgs/development/python-modules/pybullet/default.nix | 7 | ||||
-rw-r--r-- | nixpkgs/pkgs/development/python-modules/pybullet/static-libs.patch | 10 |
2 files changed, 10 insertions, 7 deletions
diff --git a/nixpkgs/pkgs/development/python-modules/pybullet/default.nix b/nixpkgs/pkgs/development/python-modules/pybullet/default.nix index d7b46f07749d..e2d391493d2d 100644 --- a/nixpkgs/pkgs/development/python-modules/pybullet/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pybullet/default.nix @@ -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 diff --git a/nixpkgs/pkgs/development/python-modules/pybullet/static-libs.patch b/nixpkgs/pkgs/development/python-modules/pybullet/static-libs.patch index 08a68b814866..8b58e3659e05 100644 --- a/nixpkgs/pkgs/development/python-modules/pybullet/static-libs.patch +++ b/nixpkgs/pkgs/development/python-modules/pybullet/static-libs.patch @@ -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, |