public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix python3Packages.pyqtgraph by not using python2.7 pil as dependency in pyopengl

This commit is contained in:
Domen Kožar 2014-11-15 18:21:27 +01:00
parent ffb635eb65
commit 00f1f9357d
1 changed files with 31 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pkgs/top-level/python-packages.nix
View File

@ -7199,7 +7199,7 @@ let
sha256 = "1fnhj26d9qrqqmjx092m1qspclh3mia3vag7rji5wciw0plpszi5"; sha256 = "1fnhj26d9qrqqmjx092m1qspclh3mia3vag7rji5wciw0plpszi5";
}; };
propagatedBuildInputs = with self; [ scipy numpy pyqt4 pyopengl ]; propagatedBuildInputs = with self; [ scipy pyqt4 pyopengl ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Scientific Graphics and GUI Library for Python"; description = "Scientific Graphics and GUI Library for Python";
@ -7445,37 +7445,31 @@ let
}; };
}; };
pyopengl =
let version = "3.0.2"; pyopengl = buildPythonPackage rec {
in
buildPythonPackage {
name = "pyopengl-${version}"; name = "pyopengl-${version}";
version = "3.0.2";
src = pkgs.fetchurl { src = pkgs.fetchurl {
url = "http://pypi.python.org/packages/source/P/PyOpenGL/PyOpenGL-${version}.tar.gz"; url = "http://pypi.python.org/packages/source/P/PyOpenGL/PyOpenGL-${version}.tar.gz";
sha256 = "9ef93bbea2c193898341f574e281c3ca0dfe87c53aa25fbec4b03581f6d1ba03"; sha256 = "9ef93bbea2c193898341f574e281c3ca0dfe87c53aa25fbec4b03581f6d1ba03";
}; };
propagatedBuildInputs = [ pkgs.mesa pkgs.freeglut self.pillow ];
propagatedBuildInputs = with pkgs; [ mesa freeglut pil ];
patchPhase = '' patchPhase = ''
sed -i "s|util.find_library( name )|name|" OpenGL/platform/ctypesloader.py sed -i "s|util.find_library( name )|name|" OpenGL/platform/ctypesloader.py
sed -i "s|'GL',|'libGL.so',|" OpenGL/platform/glx.py sed -i "s|'GL',|'libGL.so',|" OpenGL/platform/glx.py
sed -i "s|'GLU',|'${pkgs.mesa}/lib/libGLU.so',|" OpenGL/platform/glx.py sed -i "s|'GLU',|'${pkgs.mesa}/lib/libGLU.so',|" OpenGL/platform/glx.py
sed -i "s|'glut',|'${pkgs.freeglut}/lib/libglut.so',|" OpenGL/platform/glx.py sed -i "s|'glut',|'${pkgs.freeglut}/lib/libglut.so',|" OpenGL/platform/glx.py
''; '';
meta = { meta = {
homepage = http://pyopengl.sourceforge.net/; homepage = http://pyopengl.sourceforge.net/;
description = "PyOpenGL, the Python OpenGL bindings"; description = "PyOpenGL, the Python OpenGL bindings";
longDescription = '' longDescription = ''
PyOpenGL is the cross platform Python binding to OpenGL and PyOpenGL is the cross platform Python binding to OpenGL and
related APIs. The binding is created using the standard (in related APIs. The binding is created using the standard (in
Python 2.5) ctypes library, and is provided under an extremely Python 2.5) ctypes library, and is provided under an extremely
liberal BSD-style Open-Source license. liberal BSD-style Open-Source license.
''; '';
license = "BSD-style"; license = "BSD-style";
platforms = stdenv.lib.platforms.mesaPlatforms; platforms = stdenv.lib.platforms.mesaPlatforms;
}; };
@ -7721,8 +7715,9 @@ let
sha256 = "1svlwyl61rvbqbcbalkg6pbf38yjyv7qkq9sx4x35yk69lscaac2"; sha256 = "1svlwyl61rvbqbcbalkg6pbf38yjyv7qkq9sx4x35yk69lscaac2";
}; };
buildInputs = with pkgs; [ buildInputs = [
pkgconfig python gtk2 pygtk libxml2 libxslt libsoup webkitgtk2 icu pkgs.pkgconfig pkgs.gtk2 self.pygtk pkgs.libxml2
pkgs.libxslt pkgs.libsoup pkgs.webkitgtk2 pkgs.icu
]; ];
meta = { meta = {