* 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

pkgs/development/libraries/wvstreams/default.nix

@@ -1,4 +1,5 @@
-args: with args;
+{ stdenv, fetchurl, qt4, dbus, zlib, openssl, readline, perl }:
+
 stdenv.mkDerivation {
   name = "wvstreams-4.6.1";
 
@@ -11,13 +12,13 @@ stdenv.mkDerivation {
     find -type f | xargs sed -i 's@/bin/bash@bash@g'
   '';
 
-  buildInputs = [qt4 dbus zlib openssl readline perl];
+  buildInputs = [ qt4 dbus zlib openssl readline perl ];
 
   meta = {
-    description = "network programming library in C++";
+    description = "Network programming library in C++";
     homepage = http://alumnit.ca/wiki/index.php?page=WvStreams;
     license = "LGPL";
-    maintainers = [stdenv.lib.maintainers.marcweber];
+    maintainers = [ stdenv.lib.maintainers.marcweber ];
     platforms = stdenv.lib.platforms.linux;
   };
 }