BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

python pygame: move callPackage to python-packages.nix

Browse source
This commit is contained in:
Frederik Rietdijk 2015-12-09 10:07:39 +01:00
parent 292b943ec6
commit bc97b365d3
3 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
pkgs/development/python-modules/pygame/default.nix
View file

@ -1,5 +1,5 @@
{ stdenv, fetchurl, buildPythonPackage, pkgconfig, smpeg, libX11 { 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 { buildPythonPackage {
@ -15,6 +15,9 @@ buildPythonPackage {
smpeg portmidi libX11 smpeg portmidi libX11
]; ];
# /nix/store/94kswjlwqnc0k2bnwgx7ckx0w2kqzaxj-stdenv/setup: line 73: python: command not found
disabled = isPy3k;
patches = [ ./pygame-v4l.patch ]; patches = [ ./pygame-v4l.patch ];
preConfigure = '' preConfigure = ''

2
pkgs/top-level/all-packages.nix
View file

@ -9027,7 +9027,7 @@ let
pyexiv2 = callPackage ../development/python-modules/pyexiv2 { }; pyexiv2 = callPackage ../development/python-modules/pyexiv2 { };
pygame = callPackage ../development/python-modules/pygame { }; pygame = pythonPackages.pygame;
pygobject = pythonPackages.pygobject; pygobject = pythonPackages.pygobject;

2
pkgs/top-level/python-packages.nix
View file

@ -142,6 +142,8 @@ in modules // {
pycrypto = callPackage ../development/python-modules/pycrypto { }; pycrypto = callPackage ../development/python-modules/pycrypto { };
pygame = callPackage ../development/python-modules/pygame { };
pygobject = callPackage ../development/python-modules/pygobject { }; pygobject = callPackage ../development/python-modules/pygobject { };
pygobject3 = callPackage ../development/python-modules/pygobject/3.nix { }; pygobject3 = callPackage ../development/python-modules/pygobject/3.nix { };