* 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, 5 insertions, 4 deletions

diff --git a/pkgs/os-specific/linux/wvdial/default.nix b/pkgs/os-specific/linux/wvdial/default.nix
index 2b58108ba088..eb9d09d2a119 100644
--- a/pkgs/os-specific/linux/wvdial/default.nix
+++ b/pkgs/os-specific/linux/wvdial/default.nix
@@ -1,4 +1,5 @@
-args: with args;
+{ stdenv, fetchurl, wvstreams, pkgconfig }:
+
 stdenv.mkDerivation rec {
   name = "wvdial-1.61";
 
@@ -7,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "0mzcrv8mc60gbdrixc9k8ammbslvjb9x2cs50yf1jq67aabapzsg";
   };
 
-  buildInputs = [wvstreams pkgconfig];
+  buildInputs = [ wvstreams pkgconfig ];
 
   preConfigure = ''
     find -type f | xargs sed -i 's@/bin/bash@bash@g'
@@ -17,10 +18,10 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    description = "dialer automatically recognizing the modem";
+    description = "A dialer that automatically recognises the modem";
     homepage = http://alumnit.ca/wiki/index.php?page=WvDial;
     license = "LGPL";
-    maintainers = [stdenv.lib.maintainers.marcweber];
+    maintainers = [ stdenv.lib.maintainers.marcweber ];
     platforms = stdenv.lib.platforms.linux;
   };
 }