diff --git a/pkgs/development/python-modules/pyopengl/default.nix b/pkgs/development/python-modules/pyopengl/default.nix deleted file mode 100644 index 6a8008d2525..00000000000 --- a/pkgs/development/python-modules/pyopengl/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ fetchurl, stdenv, python, setuptools, mesa, freeglut, pil }: - -let version = "3.0.0b5"; -in - stdenv.mkDerivation { - name = "pyopengl-${version}"; - - src = fetchurl { - url = "mirror://sourceforge/pyopengl/PyOpenGL-${version}.tar.gz"; - sha256 = "1rjpl2qdcqn4wamkik840mywdycd39q8dn3wqfaiv35jdsbifxx3"; - }; - - # Note: We need `ctypes', available in Python 2.5+. - buildInputs = [ python ]; - propagatedBuildInputs = [ setuptools mesa freeglut pil ]; - - configurePhase = "ensureDir $out/lib/python2.5/site-packages"; - buildPhase = "python setup.py build"; - - installPhase = '' - PYTHONPATH="$out/lib/python2.5/site-packages:$PYTHONPATH" \ - python setup.py install --prefix=$out - ''; - - meta = { - homepage = http://pyopengl.sourceforge.net/; - description = "PyOpenGL, the Python OpenGL bindings"; - - longDescription = '' - PyOpenGL is the cross platform Python binding to OpenGL and - related APIs. The binding is created using the standard (in - Python 2.5) ctypes library, and is provided under an extremely - liberal BSD-style Open-Source license. - ''; - - license = "BSD-style"; - }; - } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ed918476d62..f42abb88664 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5295,10 +5295,6 @@ let inherit (gnome) libglade; }; - pyopengl = import ../development/python-modules/pyopengl { - inherit fetchurl stdenv setuptools mesa freeglut pil python; - }; - pyopenssl = builderDefsPackage (import ../development/python-modules/pyopenssl) { inherit python openssl; }; @@ -7481,10 +7477,12 @@ let # Impressive, formerly known as "KeyJNote". impressive = import ../applications/office/impressive { - inherit fetchurl stdenv xpdf pil pyopengl pygame makeWrapper lib python; + inherit fetchurl stdenv xpdf pil pygame makeWrapper lib python; # XXX These are the PyOpenGL dependencies, which we need here. inherit setuptools mesa freeglut; + + inherit (pythonPackages) pyopengl; }; inkscape = import ../applications/graphics/inkscape { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 32a0a9fe453..8e35fdacf13 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -446,6 +446,34 @@ rec { }; }); + pyopengl = + let version = "3.0.0b5"; + in + buildPythonPackage { + name = "pyopengl-${version}"; + + src = fetchurl { + url = "mirror://sourceforge/pyopengl/PyOpenGL-${version}.tar.gz"; + sha256 = "1rjpl2qdcqn4wamkik840mywdycd39q8dn3wqfaiv35jdsbifxx3"; + }; + + propagatedBuildInputs = with pkgs; [ mesa freeglut pil ]; + + meta = { + homepage = http://pyopengl.sourceforge.net/; + description = "PyOpenGL, the Python OpenGL bindings"; + + longDescription = '' + PyOpenGL is the cross platform Python binding to OpenGL and + related APIs. The binding is created using the standard (in + Python 2.5) ctypes library, and is provided under an extremely + liberal BSD-style Open-Source license. + ''; + + license = "BSD-style"; + }; + }; + pysqlite = buildPythonPackage (rec { name = "pysqlite-2.5.5";