From 9047f389bf0e646cdedf6c5c569e61d5a0e24669 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 26 Nov 2014 21:50:48 +0100 Subject: [PATCH] pygame: fix build, add all deps, use buildPythonPackage --- .../python-modules/pygame/default.nix | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/pygame/default.nix b/pkgs/development/python-modules/pygame/default.nix index 93fa70e44bc..3a24767ae4e 100644 --- a/pkgs/development/python-modules/pygame/default.nix +++ b/pkgs/development/python-modules/pygame/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchurl, python, pkgconfig -, SDL, SDL_image, SDL_mixer, SDL_ttf, libpng, libjpeg +{ stdenv, fetchurl, buildPythonPackage, pkgconfig, smpeg, libX11 +, SDL, SDL_image, SDL_mixer, SDL_ttf, libpng, libjpeg, portmidi }: -stdenv.mkDerivation { +buildPythonPackage { name = "pygame-1.9.1"; src = fetchurl { @@ -11,24 +11,21 @@ stdenv.mkDerivation { }; buildInputs = [ - python pkgconfig SDL SDL_image SDL_mixer SDL_ttf libpng libjpeg + pkgconfig SDL SDL_image SDL_mixer SDL_ttf libpng libjpeg + smpeg portmidi libX11 ]; patches = [ ./pygame-v4l.patch ]; - configurePhase = '' - for i in ${SDL_image} ${SDL_mixer} ${SDL_ttf} ${libpng} ${libjpeg}; do + preConfigure = '' + for i in ${SDL_image} ${SDL_mixer} ${SDL_ttf} ${libpng} ${libjpeg} ${portmidi} ${libX11}; do sed -e "/origincdirs =/a'$i/include'," -i config_unix.py sed -e "/origlibdirs =/aoriglibdirs += '$i/lib'," -i config_unix.py done - yes Y | LOCALBASE=/ python config.py + LOCALBASE=/ python config.py ''; - buildPhase = "python setup.py build"; - - installPhase = "python setup.py install --prefix=$out"; - meta = { description = "Python library for games"; homepage = "http://www.pygame.org/";