diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2008-10-06 22:47:20 +0000 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2008-10-06 22:47:20 +0000 |
| commit | b7ba44dff38e1005e487015ed954cd98eac60c19 (patch) | |
| tree | a6127b401bebd8ead88b8132c61f8b777f5a7846 /pkgs | |
| parent | c82c0b17f18c468d8517f2dac47b92640d56f089 (diff) | |
| download | nixlib-b7ba44dff38e1005e487015ed954cd98eac60c19.tar nixlib-b7ba44dff38e1005e487015ed954cd98eac60c19.tar.gz nixlib-b7ba44dff38e1005e487015ed954cd98eac60c19.tar.bz2 nixlib-b7ba44dff38e1005e487015ed954cd98eac60c19.tar.lz nixlib-b7ba44dff38e1005e487015ed954cd98eac60c19.tar.xz nixlib-b7ba44dff38e1005e487015ed954cd98eac60c19.tar.zst nixlib-b7ba44dff38e1005e487015ed954cd98eac60c19.zip | |
PyGame: Use SDL_mixer.
svn path=/nixpkgs/trunk/; revision=12977
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/python-modules/pygame/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 8 insertions, 4 deletions
diff --git a/pkgs/development/python-modules/pygame/default.nix b/pkgs/development/python-modules/pygame/default.nix index 85f93506c506..e0a09d94d7f0 100644 --- a/pkgs/development/python-modules/pygame/default.nix +++ b/pkgs/development/python-modules/pygame/default.nix @@ -1,4 +1,5 @@ -{ fetchurl, stdenv, python, pkgconfig, SDL, SDL_image, SDL_ttf, numeric }: +{ fetchurl, stdenv, python, pkgconfig, SDL, SDL_image, SDL_mixer, SDL_ttf +, numeric }: stdenv.mkDerivation { name = "pygame-1.7"; @@ -14,6 +15,8 @@ stdenv.mkDerivation { export LOCALBASE=/// sed -e "/origincdirs =/a'${SDL_image}/include/SDL','${SDL_image}/include'," -i config_unix.py sed -e "/origlibdirs =/aoriglibdirs += '${SDL_image}/lib'," -i config_unix.py + sed -e "/origincdirs =/a'${SDL_mixer}/include/SDL','${SDL_mixer}/include'," -i config_unix.py + sed -e "/origlibdirs =/aoriglibdirs += '${SDL_mixer}/lib'," -i config_unix.py sed -e "/origincdirs =/a'${SDL_ttf}/include/SDL','${SDL_ttf}/include'," -i config_unix.py sed -e "/origlibdirs =/aoriglibdirs += '${SDL_ttf}/lib'," -i config_unix.py sed -e "/origincdirs =/a'${numeric}/include/python2.5'," -i config_unix.py @@ -29,13 +32,14 @@ stdenv.mkDerivation { # That `config.py' is really deeply broken. sed -i Setup \ - -e "s|^NUMERIC *=.*$|NUMERIC = -I${numeric}/include/python2.5|g" + -e "s|^NUMERIC *=.*$|NUMERIC = -I${numeric}/include/python2.5|g ; + s|^MIXER *=.*$|MIXER = -I${SDL_mixer}/include -L${SDL_mixer}/lib -lSDL_mixer|g" ''; buildPhase = "yes Y | python setup.py build"; installPhase = "yes Y | python setup.py install --prefix=\${out} "; - + meta = { description = " Python library for games. diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 99dcc2eefe84..295935621ec8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4584,7 +4584,7 @@ let pygame = import ../development/python-modules/pygame { inherit fetchurl stdenv python pkgconfig SDL SDL_image - SDL_ttf numeric; + SDL_mixer SDL_ttf numeric; }; pygobject = import ../development/python-modules/pygobject { |