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

3 files changed, 12 insertions, 14 deletions

diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix
index bbdd265f7dab..2763969ddecc 100644
--- a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix
+++ b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix
@@ -33,18 +33,18 @@ Sincerly
 Marc Weber (small nix contributor)
 */
 
-args:
-args.stdenv.mkDerivation {
+args: with args;
+stdenv.mkDerivation {
   name = "teamspeak-client-rc2-2032";
 
-  src = args.fetchurl {
+  src = fetchurl {
     url = ftp://213.202.254.114/teamspeak/releases/ts2_client_rc2_2032.tar.bz2;
     md5 = "e93d17a25e07b1cbe400e4eb028ca8f8";
   };
 
   phases="installPhase";
 
-  rpathInputs = (with args; [ glibc x11 ] );
+  rpathInputs = [ glibc x11 ];
 
   installPhase="
     set -x
diff --git a/pkgs/applications/networking/msmtp/default.nix b/pkgs/applications/networking/msmtp/default.nix
index 523620a403e0..67839833c319 100644
--- a/pkgs/applications/networking/msmtp/default.nix
+++ b/pkgs/applications/networking/msmtp/default.nix
@@ -1,14 +1,12 @@
-args:
-args.stdenv.mkDerivation {
+args: with args;
+stdenv.mkDerivation {
   name = "msmtp-1.4.13";
 
-  src = args.fetchurl {
+  src = fetchurl {
     url = http://dfn.dl.sourceforge.net/sourceforge/msmtp/msmtp-1.4.13.tar.bz2;
     sha256 = "1x8q8dhcpnjym3icz6070l13hz98fvdvgc5j5psj4pmxbswx0r4p";
   };
 
-  buildInputs =(with args; []);
-
   meta = { 
       description = "a MUA";
       homepage = http://msmtp.sourceforge.net/;
diff --git a/pkgs/applications/networking/skype/default.nix b/pkgs/applications/networking/skype/default.nix
index 443c92527f2e..285cba82a3fe 100644
--- a/pkgs/applications/networking/skype/default.nix
+++ b/pkgs/applications/networking/skype/default.nix
@@ -1,16 +1,16 @@
-args:
-args.stdenv.mkDerivation {
+args: with args;
+stdenv.mkDerivation {
   name = "skype-1.4";
 
-  src = args.fetchurl {
+  src = fetchurl {
     url = http://www.skype.com/go/getskype-linux-static;
     sha256 = "0k71byzaipmw8lb92aad4qyh9rk0fnn3za74v1h268h09gkkd8mz";
     name = "skype_static-1.4.0.99.tar.bz2";
   };
 
-  buildInputs =(with args; [alsaLib glibc libSM libICE libXi libXrender libXrandr libXfixes 
+  buildInputs = [alsaLib glibc libSM libICE libXi libXrender libXrandr libXfixes 
       libXcursor libXinerama freetype fontconfig libXext libX11 
-    fontconfig libXinerama libsigcxx gcc41.gcc ]);
+    fontconfig libXinerama libsigcxx gcc41.gcc ];
 
   phases = "installPhase";
   installPhase ="