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/branches/stdenv-updates/; revision=10429

3 files changed, 12 insertions, 13 deletions

diff --git a/pkgs/tools/misc/shebangfix/default.nix b/pkgs/tools/misc/shebangfix/default.nix
index 94ecc1e00f7b..f5ed86e99f7d 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 1bf88edef2a6..9fe71248e8d3 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 305e38da464c..fbf148721cab 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";