diff options
author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2008-01-30 17:20:48 +0000 |
---|---|---|
committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2008-01-30 17:20:48 +0000 |
commit | 5bca69ac34e4b9aaa233aef75396830f42b2d3d7 (patch) | |
tree | 8d9c956fd7dcf0a68c46db61ded970e81a98736b /pkgs/development/python-modules | |
parent | f831e0420a6b17799bec42fdaaee2f11d8794ff8 (diff) |
Nix-expr style review
Unneded args.something replaced with args: with args; line. After this line args is the only place where we can recieve variables from. Also removed several buildInputs = []; lines. svn path=/nixpkgs/trunk/; revision=10415
Diffstat (limited to 'pkgs/development/python-modules')
-rw-r--r-- | pkgs/development/python-modules/pil/default.nix | 12 | ||||
-rw-r--r-- | pkgs/development/python-modules/pygame/default.nix | 12 |
2 files changed, 12 insertions, 12 deletions
diff --git a/pkgs/development/python-modules/pil/default.nix b/pkgs/development/python-modules/pil/default.nix index 863366f1a4282..d5ed9aae12a36 100644 --- a/pkgs/development/python-modules/pil/default.nix +++ b/pkgs/development/python-modules/pil/default.nix @@ -1,20 +1,20 @@ -args: -args.stdenv.mkDerivation { +args: with args; +stdenv.mkDerivation { name = "python-imaging-1.1.6"; - src = args.fetchurl { + src = fetchurl { url = http://effbot.org/downloads/Imaging-1.1.6.tar.gz; sha256 = "141zidl3s9v4vfi3nsbg42iq1lc2a932gprqr1kij5hrnn53bmvx"; }; - buildInputs =(with args; [python zlib libtiff libjpeg freetype]); + buildInputs = [python zlib libtiff libjpeg freetype]; - configurePhase = (with args;" + configurePhase = " sed -e 's@FREETYPE_ROOT = None@FREETYPE_ROOT = libinclude(\"${freetype}\")@' -i setup.py sed -e 's@JPEG_ROOT = None@JPEG_ROOT = libinclude(\"${libjpeg}\")@' -i setup.py sed -e 's@TIFF_ROOT = None@TIFF_ROOT = libinclude(\"${libtiff}\")@' -i setup.py sed -e 's@ZLIB_ROOT = None@ZLIB_ROOT = libinclude(\"${zlib}\")@' -i setup.py - "); + "; buildPhase = "true"; diff --git a/pkgs/development/python-modules/pygame/default.nix b/pkgs/development/python-modules/pygame/default.nix index 0ed717479d84d..cad9b17ebad21 100644 --- a/pkgs/development/python-modules/pygame/default.nix +++ b/pkgs/development/python-modules/pygame/default.nix @@ -1,22 +1,22 @@ -args: -args.stdenv.mkDerivation { +args: with args; +stdenv.mkDerivation { name = "pygame-1.7"; - src = args.fetchurl { + src = fetchurl { url = http://www.pygame.org/ftp/pygame-1.7.1release.tar.gz ; sha256 = "0hl0rmgjcqj217fibwyilz7w9jpg0kh7hsa7vyzd4cgqyliskpqi"; }; - buildInputs =(with args; [python pkgconfig SDL SDL_image SDL_ttf]); + buildInputs = [python pkgconfig SDL SDL_image SDL_ttf]; - configurePhase = (with args; + configurePhase = " 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_ttf}/include/SDL','${SDL_ttf}/include',\" -i config_unix.py sed -e \"/origlibdirs =/aoriglibdirs += '${SDL_ttf}/lib',\" -i config_unix.py - yes Y | python config.py "); + yes Y | python config.py "; buildPhase = "yes Y | python setup.py build"; |