* 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/interpreters/spidermonkey/default.nix

@@ -1,10 +1,11 @@
-args: with args;
+{ stdenv, fetchurl, readline }:
 
 stdenv.mkDerivation rec {
   name = "spidermonkey-1.7";
+  
   src = fetchurl {
     url = ftp://ftp.mozilla.org/pub/mozilla.org/js/js-1.7.0.tar.gz;
-	sha256 = "12v6v2ccw1y6ng3kny3xw0lfs58d1klylqq707k0x04m707kydj4";
+    sha256 = "12v6v2ccw1y6ng3kny3xw0lfs58d1klylqq707k0x04m707kydj4";
   };
 
   buildInputs = [ readline ];
@@ -13,8 +14,12 @@ stdenv.mkDerivation rec {
 
   makefileExtra = ./Makefile.extra;
   makefile = "Makefile.ref";
-  patchPhase = "cat ${makefileExtra} >> ${makefile};
-  sed -e 's/ -ltermcap/ -lncurses/' -i ${makefile}";
+  
+  patchPhase =
+    ''
+      cat ${makefileExtra} >> ${makefile}
+      sed -e 's/ -ltermcap/ -lncurses/' -i ${makefile}
+    '';
 
-  makeFlags="-f ${makefile} JS_DIST=\${out} BUILD_OPT=1 JS_READLINE=1";
+  makeFlags = "-f ${makefile} JS_DIST=\${out} BUILD_OPT=1 JS_READLINE=1";
 }