forked from mirrors/nixpkgs
python pygame: move callPackage to python-packages.nix
This commit is contained in:
parent
292b943ec6
commit
bc97b365d3
|
@ -1,5 +1,5 @@
|
|||
{ stdenv, fetchurl, buildPythonPackage, pkgconfig, smpeg, libX11
|
||||
, SDL, SDL_image, SDL_mixer, SDL_ttf, libpng, libjpeg, portmidi
|
||||
, SDL, SDL_image, SDL_mixer, SDL_ttf, libpng, libjpeg, portmidi, isPy3k,
|
||||
}:
|
||||
|
||||
buildPythonPackage {
|
||||
|
@ -15,6 +15,9 @@ buildPythonPackage {
|
|||
smpeg portmidi libX11
|
||||
];
|
||||
|
||||
# /nix/store/94kswjlwqnc0k2bnwgx7ckx0w2kqzaxj-stdenv/setup: line 73: python: command not found
|
||||
disabled = isPy3k;
|
||||
|
||||
patches = [ ./pygame-v4l.patch ];
|
||||
|
||||
preConfigure = ''
|
||||
|
|
|
@ -9027,7 +9027,7 @@ let
|
|||
|
||||
pyexiv2 = callPackage ../development/python-modules/pyexiv2 { };
|
||||
|
||||
pygame = callPackage ../development/python-modules/pygame { };
|
||||
pygame = pythonPackages.pygame;
|
||||
|
||||
pygobject = pythonPackages.pygobject;
|
||||
|
||||
|
|
|
@ -142,6 +142,8 @@ in modules // {
|
|||
|
||||
pycrypto = callPackage ../development/python-modules/pycrypto { };
|
||||
|
||||
pygame = callPackage ../development/python-modules/pygame { };
|
||||
|
||||
pygobject = callPackage ../development/python-modules/pygobject { };
|
||||
|
||||
pygobject3 = callPackage ../development/python-modules/pygobject/3.nix { };
|
||||
|
|
Loading…
Reference in a new issue