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

5 files changed, 22 insertions, 22 deletions

diff --git a/pkgs/os-specific/linux/bridge_utils/default.nix b/pkgs/os-specific/linux/bridge_utils/default.nix
index 9763e28915d..b4f5efce22f 100644
--- a/pkgs/os-specific/linux/bridge_utils/default.nix
+++ b/pkgs/os-specific/linux/bridge_utils/default.nix
@@ -1,13 +1,13 @@
-args:
-args.stdenv.mkDerivation {
+args: with args;
+stdenv.mkDerivation {
   name = "bridge-utils-1.2";
 
-  src = args.fetchurl {
+  src = fetchurl {
     url = mirror://sourceforge/bridge/bridge-utils-1.2.tar.gz;
     sha256 = "0jg3z51c2c34byg4zi39j9g4b66js5kanjhid77hpa0jdfmryfy9";
   };
 
-  buildInputs =(with args; [autoconf automake]);
+  buildInputs = [autoconf automake];
 
   preConfigure="autoreconf";
 
diff --git a/pkgs/os-specific/linux/kernel/acerhk/default.nix b/pkgs/os-specific/linux/kernel/acerhk/default.nix
index 577d0f51027..8fe45048d7f 100644
--- a/pkgs/os-specific/linux/kernel/acerhk/default.nix
+++ b/pkgs/os-specific/linux/kernel/acerhk/default.nix
@@ -1,14 +1,14 @@
-args:
-args.stdenv.mkDerivation {
+args: with args;
+stdenv.mkDerivation {
   name = "acerhk_kernel_patch-0.5.35";
-  kernel = args.kernel.src;
-  inherit (args) debug;
-  acerhk = args.fetchurl {
+  kernel = kernel.src;
+  inherit debug;
+  acerhk = fetchurl {
     url = http://mirror.switch.ch/mirror/gentoo/distfiles/acerhk-0.5.35.tar.bz2;
     sha256 = "1kg002qraa8vha2cgza3z74d9j46g180g5b44zbv64dsa9n2j4b0";
   };
 
-  buildInputs =(with args; [gnupatch]);
+  buildInputs = [gnupatch];
   
   builder = ./builder.sh;
 
diff --git a/pkgs/os-specific/linux/nfs-utils/default.nix b/pkgs/os-specific/linux/nfs-utils/default.nix
index 5240bba5d14..18278ef3c34 100644
--- a/pkgs/os-specific/linux/nfs-utils/default.nix
+++ b/pkgs/os-specific/linux/nfs-utils/default.nix
@@ -1,13 +1,13 @@
-args:
-args.stdenv.mkDerivation {
+args: with args;
+stdenv.mkDerivation {
   name = "nfs-utils-1.1.1";
 
-  src = args.fetchurl {
+  src = fetchurl {
     url = mirror://sourceforge/nfs/nfs-utils-1.1.1.tar.gz;
     sha256 = "0aa434cv7lgbrhks0rzhwxvbk2zsa17kjwxqjrrh87zrv9d2sr1x";
   };
 
-  buildInputs =(with args; [kernelHeaders tcp_wrapper]);
+  buildInputs = [kernelHeaders tcp_wrapper];
 
   meta = { 
       description = "nfs utils";
diff --git a/pkgs/os-specific/linux/radeontools/default.nix b/pkgs/os-specific/linux/radeontools/default.nix
index 67d6cc4575f..d4d39606d62 100644
--- a/pkgs/os-specific/linux/radeontools/default.nix
+++ b/pkgs/os-specific/linux/radeontools/default.nix
@@ -1,8 +1,8 @@
-args:
-args.stdenv.mkDerivation {
+args: with args;
+stdenv.mkDerivation {
   name = "radeontool-1.5";
 
-  inherit (args) pciutils;
+  inherit pciutils;
 
   # Don't know wether it's a good idea to hardcode the lspci path..
   # But it will work on nix..
@@ -12,7 +12,7 @@ args.stdenv.mkDerivation {
     cd ..
   ";
 
-  src = args.fetchurl {
+  src = fetchurl {
     url = http://fdd.com/software/radeon/radeontool-1.5.tar.gz;
     sha256 = "0qbkawhhq0y0gqbbql7q04y0v0hims5c4jkjsbc1y03rf9kr10ar";
   };
diff --git a/pkgs/os-specific/linux/tcp-wrapper/default.nix b/pkgs/os-specific/linux/tcp-wrapper/default.nix
index 35c68a6d9a4..9c952bcabf8 100644
--- a/pkgs/os-specific/linux/tcp-wrapper/default.nix
+++ b/pkgs/os-specific/linux/tcp-wrapper/default.nix
@@ -1,8 +1,8 @@
-args:
-args.stdenv.mkDerivation {
+args: with args;
+stdenv.mkDerivation {
   name = "tcp-wrappers-7.6";
 
-  src = args.fetchurl {
+  src = fetchurl {
     url = http://ftp.debian.org/debian/pool/main/t/tcp-wrappers/tcp-wrappers_7.6.dbs.orig.tar.gz;
     sha256 = "0k68ziinx6biwar5lcb9jvv0rp6b3vmj6861n75bvrz4w1piwkdp";
   };
@@ -20,7 +20,7 @@ args.stdenv.mkDerivation {
     make CFLAGS='-DSYS_ERRLIST_DEFINED=1  -Dvsyslog=1' tcpd
   "
 
-  buildInputs =(with args; [kernelHeaders gnused]);
+  buildInputs = [kernelHeaders gnused];
 
   # meta = ...
 }