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
This commit is contained in:
@@ -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";
|
||||
|
||||
|
||||
Reference in New Issue
Block a user