* Get rid of many instances of "args: with args;", and other coding

  guidelines violations.
* Updated libsamplerate to 0.1.7.

svn path=/nixpkgs/trunk/; revision=22782

1 files changed, 9 insertions, 8 deletions

diff --git a/pkgs/tools/misc/proxytunnel/default.nix b/pkgs/tools/misc/proxytunnel/default.nix
index f587437b5da..f5be7b8a46d 100644
--- a/pkgs/tools/misc/proxytunnel/default.nix
+++ b/pkgs/tools/misc/proxytunnel/default.nix
@@ -1,19 +1,20 @@
-args:
-args.stdenv.mkDerivation {
+{ stdenv, fetchurl, openssl }:
+
+stdenv.mkDerivation {
   name = "proxytunnel-1.9.0";
 
-  src = args.fetchurl {
+  src = fetchurl {
     url = mirror://sourceforge/proxytunnel/proxytunnel-1.9.0.tgz;
     sha256 = "1fd644kldsg14czkqjybqh3wrzwsp3dcargqf4fjkpqxv3wbpx9f";
   };
 
-  buildInputs =(with args; [openssl]);
+  buildInputs = [ openssl ];
 
-  installPhase=''make DESTDIR="$out" PREFIX="" install'';
+  installPhase = ''make DESTDIR="$out" PREFIX="" install'';
 
   meta = {
-      description = "program that connects stdin and stdout to a server somewhere on the network, through a standard HTTPS proxy";
-      homepage = http://proxytunnel.sourceforge.net/download.php;
-      license = "GPLv2";
+    description = "program that connects stdin and stdout to a server somewhere on the network, through a standard HTTPS proxy";
+    homepage = http://proxytunnel.sourceforge.net/download.php;
+    license = "GPLv2";
   };
 }