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

10 files changed, 39 insertions, 42 deletions

diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix
index e722d4ff9db..aa50f67719c 100644
--- a/pkgs/applications/misc/blender/default.nix
+++ b/pkgs/applications/misc/blender/default.nix
@@ -1,18 +1,18 @@
-args:
-args.stdenv.mkDerivation {
+args: with args;
+stdenv.mkDerivation {
   name = "blender-2.45";
 
-  src = args.fetchurl {
+  src = fetchurl {
     url = http://download.blender.org/source/blender-2.45.tar.gz;
     sha256 = "1bi7j1fcvrpb96sjpcbm4sldf359sgskfhv7a8pgcxj0bnhp47wj";
   };
 
   phases="unpackPhase buildPhase";
 
-  inherit (args) scons SDL freetype openal python openexr mesa;
+  inherit scons SDL freetype openal python openexr mesa;
 
-  buildInputs =(with args; [python scons
-         gettext libjpeg libpng zlib freetype /* fmod smpeg */ freealut openal x11 mesa inputproto libtiff libXi ]);
+  buildInputs = [python scons
+         gettext libjpeg libpng zlib freetype /* fmod smpeg */ freealut openal x11 mesa inputproto libtiff libXi ];
 
   # patch SConstruct so that we can pass on additional include.  Either blender
   # or openEXR is broken. I think OpenEXR should use include "" isntead of <> to
diff --git a/pkgs/applications/misc/d4x/default.nix b/pkgs/applications/misc/d4x/default.nix
index 5a20893e9f3..f4ad3cc8421 100644
--- a/pkgs/applications/misc/d4x/default.nix
+++ b/pkgs/applications/misc/d4x/default.nix
@@ -1,10 +1,10 @@
-args:
-args.stdenv.mkDerivation {
+args: with args;
+stdenv.mkDerivation {
   name = "d4x-2.5.7.1";
   
-  inherit (args) boost;
+  inherit boost;
 
-  src = args.fetchurl {
+  src = fetchurl {
     url =  http://d4x.krasu.ru/files/d4x-2.5.7.1.tar.bz2;
     sha256 = "1i1jj02bxynisqapv31481sz9jpfp3f023ky47spz1v1wlwbs13m";
   };
@@ -12,7 +12,7 @@ args.stdenv.mkDerivation {
   configurePhase = "./configure --prefix=\$out "
     + " --with-boost-libdir=\$boost/lib"
     + " --with-boost-includedir=\$boost/include";
-  buildInputs =(with args; [gtk glib pkgconfig openssl boost]);
+  buildInputs = [gtk glib pkgconfig openssl boost];
 
   meta = { 
       description = "graphical download manager";
diff --git a/pkgs/applications/misc/flite/default.nix b/pkgs/applications/misc/flite/default.nix
index 291cce6c1f9..ad3b9df164d 100644
--- a/pkgs/applications/misc/flite/default.nix
+++ b/pkgs/applications/misc/flite/default.nix
@@ -1,8 +1,8 @@
-args:
-args.stdenv.mkDerivation {
+args: with args;
+stdenv.mkDerivation {
   name = "flite-1.3-release";
 
-  src = args.fetchurl {
+  src = fetchurl {
     url = http://www.speech.cs.cmu.edu/flite/packed/flite-1.3/flite-1.3-release.tar.gz;
     sha256 = "12wanxx57bbqgkag54dlqzv6h2kr9053p0z8mkxs0mqy03vja8lj";
   };
@@ -18,8 +18,6 @@ args.stdenv.mkDerivation {
     cp -r bin \$out
   ";
 
-  buildInputs = (with args; []);
-
   meta = { 
       description = "Flite text to speech engine";
       homepage = http://www.speech.cs.cmu.edu/flite/download.html;
diff --git a/pkgs/applications/misc/freemind/default.nix b/pkgs/applications/misc/freemind/default.nix
index 79b00204fd4..b7bc3f3c8dd 100644
--- a/pkgs/applications/misc/freemind/default.nix
+++ b/pkgs/applications/misc/freemind/default.nix
@@ -1,15 +1,15 @@
-args:
-args.stdenv.mkDerivation {
+args: with args;
+stdenv.mkDerivation {
   name = "freemind-0.9.0_Beta_13";
 
-  src = args.fetchurl {
+  src = fetchurl {
     url = http://downloads.sourceforge.net/freemind/freemind-src-0.9.0_Beta_13_icon_butterfly.tar.gz;
     sha256 = "00389bhg73qknydrq0f3bskb5lyrdg2p58mnnp19wdvzzmfbic4w";
   };
 
-  buildInputs =(with args; [jdk ant]);
+  buildInputs = [jdk ant];
 
-  inherit (args) jre;
+  inherit jre;
 
   phases="buildPhase installPhase";
 
diff --git a/pkgs/applications/misc/mrxvt/default.nix b/pkgs/applications/misc/mrxvt/default.nix
index aaabef2b6b8..f58fff56bc0 100644
--- a/pkgs/applications/misc/mrxvt/default.nix
+++ b/pkgs/applications/misc/mrxvt/default.nix
@@ -10,11 +10,11 @@ let
     };
 };
 
-in args.stdenv.mkDerivation {
+in stdenv.mkDerivation {
 
   inherit (co) buildInputs configureFlags;
 
-  src = args.fetchurl {
+  src = fetchurl {
     url = mirror://sourceforge/materm/mrxvt-0.5.3.tar.gz;
     sha256 = "04flnn58hp4qvvk6jzyipsj13v1qyrjabgbw5laz5cqxvxzpncp2";
   };
diff --git a/pkgs/applications/misc/pgadmin/default.nix b/pkgs/applications/misc/pgadmin/default.nix
index 733bf02a054..d60a3ca1548 100644
--- a/pkgs/applications/misc/pgadmin/default.nix
+++ b/pkgs/applications/misc/pgadmin/default.nix
@@ -1,14 +1,14 @@
-args:
-args.stdenv.mkDerivation {
+args: with args;
+stdenv.mkDerivation {
   name = "pgadmin3-1.8.1";
 
-  src = args.fetchurl {
+  src = fetchurl {
     name = "pgadmin3-v1.8.1.tar.gz";
     url = "http://ftp3.de.postgresql.org/pub/Mirrors/ftp.postgresql.org//pgadmin3/release/v1.8.1/src/pgadmin3-1.8.1.tar.gz";
     sha256 = "1vnpbgb2ksvcgbzab4jjspwvs5cvam53azinfavjad4kpjczdywb";
   };
 
-  buildInputs =(with args; [postgresql wxGTK libxml2 libxslt openssl]);
+  buildInputs = [postgresql wxGTK libxml2 libxslt openssl];
 
   meta = { 
       description = "postgresql admin gui tool";
diff --git a/pkgs/applications/misc/pstree/default.nix b/pkgs/applications/misc/pstree/default.nix
index c59148e854e..c26876f2fcb 100644
--- a/pkgs/applications/misc/pstree/default.nix
+++ b/pkgs/applications/misc/pstree/default.nix
@@ -1,14 +1,13 @@
-args:
-args.stdenv.mkDerivation {
+args: with args;
+stdenv.mkDerivation {
   name = "pstree-2.31";
 
-  src = args.fetchurl {
+  src = fetchurl {
     url = http://fresh.t-systems-sfr.com/unix/src/misc/pstree-2.31.tar.gz;
     sha256 = "1zzz29gsyra8csk54cyq0pcdxxg3l4gmksq8q1skv2z84g2yxdhh";
   };
 
   unpackPhase="unpackFile \$src; sourceRoot=.";
-  #buildInputs =(with args; []);
   
   buildPhase="pwd; gcc -o pstree pstree.c";
   installPhase="ensureDir \$out/bin; cp pstree \$out/bin";
diff --git a/pkgs/applications/misc/rxvt/default.nix b/pkgs/applications/misc/rxvt/default.nix
index c875e55a8cb..58366c6aa04 100644
--- a/pkgs/applications/misc/rxvt/default.nix
+++ b/pkgs/applications/misc/rxvt/default.nix
@@ -1,13 +1,13 @@
-args:
-args.stdenv.mkDerivation {
+args: with args;
+stdenv.mkDerivation {
   name = "rxvt-2.6.4";
 
-  src = args.fetchurl {
+  src = fetchurl {
     url = http://downloads.sourceforge.net/rxvt/rxvt-2.6.4.tar.gz;
     sha256 = "0hi29whjv8v11nkjbq1i6ms411v6csykghmlpkmayfjn9nxr02xg";
   };
 
-  buildInputs =(with args; [ libX11 libXt ]);
+  buildInputs = [ libX11 libXt ];
 
   meta = { 
       description = "colour vt102 terminal emulator with less features and lower memory consumption";
diff --git a/pkgs/applications/misc/sbagen/default.nix b/pkgs/applications/misc/sbagen/default.nix
index d78742bfc5b..6bf28580b35 100644
--- a/pkgs/applications/misc/sbagen/default.nix
+++ b/pkgs/applications/misc/sbagen/default.nix
@@ -1,5 +1,5 @@
-args:
-args.stdenv.mkDerivation {
+args: with args;
+stdenv.mkDerivation {
   name = "sbagen-1.4.4";
 
   buildPhases="buildPhase installPhase";
@@ -14,7 +14,7 @@ args.stdenv.mkDerivation {
   
    ";
 
-  src = args.fetchurl {
+  src = fetchurl {
     url = http://uazu.net/sbagen/sbagen-1.4.4.tgz;
     sha256 = "0w62yk1b0hq79kl0angma897yqa8p1ww0dwydf3zlwav333prkd2";
   };
diff --git a/pkgs/applications/misc/synergy/default.nix b/pkgs/applications/misc/synergy/default.nix
index 7872c6abaaf..be0c449abc7 100644
--- a/pkgs/applications/misc/synergy/default.nix
+++ b/pkgs/applications/misc/synergy/default.nix
@@ -1,15 +1,15 @@
-args:
-args.stdenv.mkDerivation {
+args: with args;
+stdenv.mkDerivation {
   name = "synergy-cvs";
 
-  src = args.fetchcvs {
+  src = fetchcvs {
     url = ":pserver:anonymous@synergy2.cvs.sourceforge.net:/cvsroot/synergy2";
     module = "synergy";
     date = "NOW";
     sha256 = "ef8e2ebfda6e43240051a7af9417092b2af50ece8b5c6c3fbd908ba91c4fe068";
   };
 
-  buildInputs =(with args; [x11 xextproto libXtst inputproto]);
+  buildInputs = [x11 xextproto libXtst inputproto];
 
   meta= { 
       description = "share mouse keyboard and clipboard between computers";