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

pkgs/development/libraries/SDL_image/default.nix

@@ -1,14 +1,13 @@
-args:
-args.stdenv.mkDerivation {
+args: with args;
+stdenv.mkDerivation {
   name = "SDL_image-1.2.6";
 
-  src = args.
-	fetchurl {
+  src = fetchurl {
 		url = http://www.libsdl.org/projects/SDL_image/release/SDL_image-1.2.6.tar.gz;
 		sha256 = "1i3f72dw3i3l6d77dk81gw57sp0629rng9k76qb37brlz7dv3z48";
 	};
 
-  buildInputs =(with args; [SDL libpng libjpeg libtiff libungif libXpm]);
+  buildInputs = [SDL libpng libjpeg libtiff libungif libXpm];
 
   postInstall = "ln -s \${out}/include/SDL/SDL_image.h \${out}/include/";
 

pkgs/development/libraries/SDL_ttf/default.nix

@@ -1,14 +1,13 @@
-args:
-args.stdenv.mkDerivation {
+args: with args;
+stdenv.mkDerivation {
   name = "SDL_image-1.2.6";
 
-  src = args.
-	fetchurl {
+  src = fetchurl {
 		url = http://www.libsdl.org/projects/SDL_ttf/release/SDL_ttf-2.0.9.tar.gz;
 		sha256 = "0ls6anmlmwrmy21p3y9nfyl6fkwz4jpgh74kw7xd0hwbg5v8h95l";
 	};
 
-  buildInputs =(with args; [SDL freetype]);
+  buildInputs = [SDL freetype];
 
   postInstall = "ln -s \${out}/include/SDL/SDL_ttf.h \${out}/include/";
 

pkgs/development/libraries/ctl/default.nix

@@ -1,16 +1,16 @@
-args:
-args.stdenv.mkDerivation {
+args: with args;
+stdenv.mkDerivation {
   name = "ctl-1.4.1";
 
-  src = args.fetchurl {
+  src = fetchurl {
     url = http://surfnet.dl.sourceforge.net/sourceforge/ampasctl/ctl-1.4.1.tar.gz;
     sha256 = "16lzgbpxdyhykdwndj1i9vx3h4bfkxqqcrvasvgg70gb5raxj0mj";
   };
 
-  propagatedBuildInputs = (with args; [ilmbase]);
-  configureFlags="--with-ilmbase-prefix=${args.ilmbase}";
+  propagatedBuildInputs =  [ilmbase];
+  configureFlags="--with-ilmbase-prefix=${ilmbase}";
   #configurePhase = "
-    #export CXXFLAGS=\"-I${args.ilmbase}/include -L${args.ilmbase}/lib\"
+    #export CXXFLAGS=\"-I${ilmbase}/include -L${ilmbase}/lib\"
     #echo $CXXFLAGS
     #unset configurePhase; configurePhase
   #";

pkgs/development/libraries/glew/default.nix

@@ -1,13 +1,13 @@
-args:
-args.stdenv.mkDerivation {
+args: with args;
+stdenv.mkDerivation {
   name = "glew-1.5.0";
 
-  src = args.fetchurl {
+  src = fetchurl {
     url = http://dfn.dl.sourceforge.net/sourceforge/glew/glew-1.5.0-src.tgz;
     sha256 = "1kjr1fchnl785wsg11vzc03q3pm12lh20n1i593zr1xqfjgx2b4h";
   };
 
-  buildInputs =(with args; [mesa x11 libXmu libXi]);
+  buildInputs = [mesa x11 libXmu libXi];
 
   meta = { 
       description = "cross-platform open-source C/C++ extension loading library";

pkgs/development/libraries/gsl/default.nix

@@ -1,14 +1,12 @@
-args:
-args.stdenv.mkDerivation {
+args: with args;
+stdenv.mkDerivation {
   name = "gsl-1.9";
 
-  src = args.fetchurl {
+  src = fetchurl {
     url = ftp://ftp.gnu.org/gnu/gsl/gsl-1.9.tar.gz;
     sha256 = "0l12js65c1qf3s7gmgay6gj5nbs6635py41dj8nk3hlp95wcdlgw";
   };
 
-  buildInputs =(with args; []);
-
   meta = { 
       description = "numerical library (>1000 functions)";
       homepage = http://www.gnu.org/software/gsl;

pkgs/development/libraries/libavc1394/default.nix

@@ -1,13 +1,13 @@
-args:
-args.stdenv.mkDerivation {
+args: with args;
+stdenv.mkDerivation {
   name = "libavc1394-0.5.3";
 
-  src = args.fetchurl {
+  src = fetchurl {
     url = mirror://sourceforge/libavc1394/libavc1394-0.5.3.tar.gz;
     sha256 = "19i40i3722ilhziknfds3a6w5xzv66fvc68gvbir1p2fvwi6ij93";
   };
 
-  buildInputs =(with args; [pkgconfig libraw1394]);
+  buildInputs = [pkgconfig libraw1394];
 
   meta = { 
       description = "programming interface for the 1394 Trade Association AV/C (Audio/Video Control) Digital Interface Command Set";

pkgs/development/libraries/libiec61883/default.nix

@@ -1,13 +1,13 @@
-args:
-args.stdenv.mkDerivation {
+args: with args;
+stdenv.mkDerivation {
   name = "libiec61883-1.1.0";
 
-  src = args.fetchurl {
+  src = fetchurl {
     url = http://www.linux1394.org/dl/libiec61883-1.1.0.tar.gz;
     sha256 = "09f0ca7bp6lqlz6601gnyl04mfabv0azg49n1cmjyqpzh35cgxkq";
   };
 
-  buildInputs =(with args; [pkgconfig libraw1394]);
+  buildInputs = [pkgconfig libraw1394];
 
   meta = { 
       description = "TODO";

pkgs/development/libraries/libraw1394/default.nix

@@ -1,14 +1,12 @@
-args:
-args.stdenv.mkDerivation {
+args: with args;
+stdenv.mkDerivation {
   name = "libraw1394-1.2.0";
 
-  src = args.fetchurl {
+  src = fetchurl {
     url = "mirror://sourceforge/libraw1394/libraw1394-1.2.0.tar.gz";
     sha256 = "1b9zqqzyz0ihyfvhn135y3wc6vmym5yz21jxj9dp0f09b96gmp0z";
   };
 
-  buildInputs =(with args; []);
-
   meta = { 
       description = "library providing direct access to the IEEE 1394 bus through the Linux 1394 subsystem's raw1394 user space interface";
       homepage = "http://wiki.linux1394.org/";

pkgs/development/libraries/libwmf/default.nix

@@ -1,15 +1,14 @@
-args:
-args.stdenv.mkDerivation {
+args: with args;
+stdenv.mkDerivation {
   name = "libwmf-0.2.8.4";
 
-  src = args.
-	fetchurl {
+  src = fetchurl {
 		url = mirror://sourceforge/wvware/libwmf-0.2.8.4.tar.gz;
 		sha256 = "1y3wba4q8pl7kr51212jwrsz1x6nslsx1gsjml1x0i8549lmqd2v";
 	};
 
-  buildInputs =(with args; [zlib imagemagick libpng
-	pkgconfig glib freetype libjpeg libxml2]);
+  buildInputs = [zlib imagemagick libpng
+	pkgconfig glib freetype libjpeg libxml2];
 
   meta = {
     description = "

pkgs/development/libraries/openexr_ctl/default.nix

@@ -1,17 +1,17 @@
-args:
-args.stdenv.mkDerivation {
+args: with args;
+stdenv.mkDerivation {
   name = "openexr_ctl-1.0.1";
 
-  src = args.fetchurl {
+  src = fetchurl {
     url = http://kent.dl.sourceforge.net/sourceforge/ampasctl/openexr_ctl-1.0.1.tar.gz;
     sha256 = "1jg9smpaplal8l14djp184wzk11nwd3dvm4lhkp69kjgw8jdd21d";
   };
 
-  propagatedBuildInputs = (with args; [ilmbase]);
-  buildInputs = ( with args; [openexr ctl]);
-  configureFlags="--with-ilmbase-prefix=${args.ilmbase}";
+  propagatedBuildInputs = [ilmbase];
+  buildInputs = [openexr ctl];
+  configureFlags="--with-ilmbase-prefix=${ilmbase}";
   #configurePhase = "
-    #export CXXFLAGS=\"-I${args.ilmbase}/include -L${args.ilmbase}/lib\"
+    #export CXXFLAGS=\"-I${ilmbase}/include -L${ilmbase}/lib\"
     #echo $CXXFLAGS
     #unset configurePhase; configurePhase
   #";

pkgs/development/libraries/proj.4/default.nix

@@ -1,14 +1,12 @@
-args:
-args.stdenv.mkDerivation {
+args: with args;
+stdenv.mkDerivation {
   name = "proj-4.5.0";
 
-  src = args.fetchurl {
+  src = fetchurl {
     url = ftp://ftp.remotesensing.org/proj/proj-4.5.0.tar.gz;
     sha256 = "1d2qz0vgp13hkfgaz7hkblhb9w2fh2blbjqz73xdinwc08cmflqv";
   };
 
-  buildInputs =(with args; []);
-
   meta = { 
       description = "Cartographic Projections Library";
       homepage = http://proj.maptools.org;