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

7 files changed, 27 insertions, 33 deletions

diff --git a/pkgs/tools/X11/xmacro/default.nix b/pkgs/tools/X11/xmacro/default.nix
index c1f039a9215..4cceb720e19 100644
--- a/pkgs/tools/X11/xmacro/default.nix
+++ b/pkgs/tools/X11/xmacro/default.nix
@@ -1,8 +1,8 @@
-args:
-args.stdenv.mkDerivation {
+args: with args;
+stdenv.mkDerivation {
   name = "xmacro";
 
-  src = args.fetchurl {
+  src = fetchurl {
     url = mirror://sourceforge/xmacro/xmacro-pre0.3-20000911.tar.gz;
     md5 = "d2956b82f3d5380e58a75ccc721fb746";
   };
@@ -11,6 +11,5 @@ args.stdenv.mkDerivation {
 
   preInstall="echo -e 'install:\n	mkdir \${out}/bin;\n	cp xmacrorec xmacrorec2 xmacroplay \${out}/bin;' >>Makefile; ";
 
-  buildInputs = (with args; 
-	[libX11 libXtst xextproto libXi inputproto]);
+  buildInputs = [libX11 libXtst xextproto libXi inputproto];
 }
diff --git a/pkgs/tools/backup/rdiff-backup/default.nix b/pkgs/tools/backup/rdiff-backup/default.nix
index 43fd17a6178..8cd660adc8c 100644
--- a/pkgs/tools/backup/rdiff-backup/default.nix
+++ b/pkgs/tools/backup/rdiff-backup/default.nix
@@ -1,8 +1,8 @@
-args:
-args.stdenv.mkDerivation {
+args: with args;
+stdenv.mkDerivation {
   name = "rdiff-backup-1.1.14";
 
-  src = args.fetchurl {
+  src = fetchurl {
     url = http://savannah.nongnu.org/download/rdiff-backup/rdiff-backup-1.1.14.tar.gz;
     sha256 = "0sh2kz90z47yfa9786dyn3q9ba1xcmjvd65rykvm7mg5apnrg27h";
   };
@@ -14,7 +14,7 @@ args.stdenv.mkDerivation {
     
   ";
 
-  buildInputs = (with args; [python librsync gnused ]);
+  buildInputs = [python librsync gnused ];
 
   meta = {
       description = "backup system trying to combine best a mirror and an incremental backup system";
diff --git a/pkgs/tools/hddtemp/default.nix b/pkgs/tools/hddtemp/default.nix
index 0bb51287474..9f285a6cd51 100644
--- a/pkgs/tools/hddtemp/default.nix
+++ b/pkgs/tools/hddtemp/default.nix
@@ -1,12 +1,12 @@
-args:
-args.stdenv.mkDerivation {
+args: with args;
+stdenv.mkDerivation {
   name = "hddtemp-0.3-beta15";
 
-  db = args.fetchurl{
+  db = fetchurl{
               url = http://download.savannah.nongnu.org/releases/hddtemp/hddtemp.db;
               sha256 = "1fr6qgns6qv7cr40lic5yqwkkc7yjmmgx8j0z6d93csg3smzhhya";
        };
-  src = args.fetchurl {
+  src = fetchurl {
             url = http://download.savannah.nongnu.org/releases/hddtemp/hddtemp-0.3-beta15.tar.bz2;
             sha256 = "0nzgg4nl8zm9023wp4dg007z6x3ir60rwbcapr9ks2al81c431b1";
   };
@@ -17,8 +17,6 @@ args.stdenv.mkDerivation {
     ./configure --prefix=\$out --with-db-path=\$out/nix-support/hddtemp.db
   "; 
 
-  buildInputs =(with args; []);
-
   meta = { 
       description = "shows the harddisk temperature";
       homepage = https://savannah.nongnu.org/projects/hddtemp/;
diff --git a/pkgs/tools/misc/shebangfix/default.nix b/pkgs/tools/misc/shebangfix/default.nix
index 94ecc1e00f7..f5ed86e99f7 100644
--- a/pkgs/tools/misc/shebangfix/default.nix
+++ b/pkgs/tools/misc/shebangfix/default.nix
@@ -1,8 +1,8 @@
-args:
-args.stdenv.mkDerivation {
+args: with args;
+stdenv.mkDerivation {
   name = "shebangfix-0.0";
 
-  buildInputs = [args.perl];
+  buildInputs = [perl];
 
   file = ./shebangfix.pl;
 
diff --git a/pkgs/tools/misc/wv/default.nix b/pkgs/tools/misc/wv/default.nix
index 1bf88edef2a..9fe71248e8d 100644
--- a/pkgs/tools/misc/wv/default.nix
+++ b/pkgs/tools/misc/wv/default.nix
@@ -1,15 +1,14 @@
-args:
-args.stdenv.mkDerivation {
+args: with args;
+stdenv.mkDerivation {
   name = "wv-1.2.4";
 
-  src = args.
-	fetchurl {
+  src = fetchurl {
 		url = mirror://sourceforge/wvware/wv-1.2.4.tar.gz;
 		sha256 = "1mn2ax6qjy3pvixlnvbkn6ymy6y4l2wxrr4brjaczm121s8hjcb7";
 	};
 
-  buildInputs =(with args; [zlib imagemagick libpng glib
-	pkgconfig libgsf libxml2 bzip2]);
+  buildInputs = [zlib imagemagick libpng glib
+	pkgconfig libgsf libxml2 bzip2];
 
   meta = {
     description = "
diff --git a/pkgs/tools/misc/xclip/default.nix b/pkgs/tools/misc/xclip/default.nix
index 305e38da464..fbf148721ca 100644
--- a/pkgs/tools/misc/xclip/default.nix
+++ b/pkgs/tools/misc/xclip/default.nix
@@ -1,15 +1,15 @@
-args:
-args.stdenv.mkDerivation {
+args: with args;
+stdenv.mkDerivation {
   name = "xclip-0.08";
 
-  src = args.fetchurl {
+  src = fetchurl {
     url = http://people.debian.org/~kims/xclip/xclip-0.08.tar.gz;
     sha256 = "0py6ijw7ln892gzxxm2w47nn97nb6psb8g6clkpz86gg706yjxpf";
   };
 
   patchPhase = "sed -i s=/usr/X11R6/bin=/bin=  Makefile";
 
-  buildInputs =(with args; [x11 libXmu]);
+  buildInputs = [x11 libXmu];
 
   installPhase="make install DESTDIR=\$out";
 
diff --git a/pkgs/tools/networking/dnsmasq/default.nix b/pkgs/tools/networking/dnsmasq/default.nix
index 7b3cd59ba6c..b50cdeadfa3 100644
--- a/pkgs/tools/networking/dnsmasq/default.nix
+++ b/pkgs/tools/networking/dnsmasq/default.nix
@@ -1,16 +1,14 @@
-args:
-args.stdenv.mkDerivation {
+args: with args;
+stdenv.mkDerivation {
   name = "dnsmasq-2.40";
 
-  src = args.fetchurl {
+  src = fetchurl {
     url = http://www.thekelleys.org.uk/dnsmasq/dnsmasq-2.40.tar.gz;
     sha256 = "1q346l403rvvmvr14fk2l201p8fl3p5417vkp95zlx00jdb7hl8n";
   };
 
   installPhase = "ensureDir \$out; make DESTDIR=\$out PREFIX=ôônstall"; 
 
-  buildInputs =(with args; []);
-
   meta = { 
       description = "DNS forwarder and DHCP server";
       homepage = http://www.thekelleys.org.uk/dnsmasq/doc.html;