Dawoox/nixpkgs
1
1
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Nix-expr style review

Browse Source 
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/branches/stdenv-updates/; revision=10429
This commit is contained in:
Yury G. Kudryashov
2008-01-31 10:41:04 +00:00
parent b1b8c4f258
commit fbfab88e04
53 changed files with 220 additions and 248 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/development/python-modules/pil/default.nix
View File

@@ -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";

12
pkgs/development/python-modules/pygame/default.nix
View File

@@ -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";