* 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, 10 insertions, 9 deletions

diff --git a/pkgs/applications/misc/audio/wavesurfer/default.nix b/pkgs/applications/misc/audio/wavesurfer/default.nix
index 24429cfddad..ab22312e903 100644
--- a/pkgs/applications/misc/audio/wavesurfer/default.nix
+++ b/pkgs/applications/misc/audio/wavesurfer/default.nix
@@ -1,13 +1,14 @@
-args:
-args.stdenv.mkDerivation {
+{ stdenv, fetchurl, snack, tcl, tk, makeWrapper }:
+
+stdenv.mkDerivation {
   name = "wavesurfer-1.8.5";
 
-  src = args.fetchurl {
+  src = fetchurl {
     url = http://www.speech.kth.se/wavesurfer/wavesurfer-1.8.5.tar.gz;
     sha256 = "1yx9s1j47cq0v40cwq2gn7bdizpw46l95ba4zl9z4gg31mfvm807";
   };
 
-  buildInputs =(with args; [snack tcl tk makeWrapper]);
+  buildInputs = [ snack tcl tk makeWrapper ];
 
   installPhase = ''
     ensureDir $out/{bin,nix-support,share/wavesurfer/}
@@ -15,13 +16,13 @@ args.stdenv.mkDerivation {
     mv * $out/nix-support
     ln -s $out/{nix-support,bin}/wavesurfer.tcl
     wrapProgram "$out/nix-support/wavesurfer.tcl"  \
-                 --set TCLLIBPATH "${args.snack}/lib" \
-                 --prefix PATH : "${args.tcl}/bin:${args.tk}/bin"
+                 --set TCLLIBPATH "${snack}/lib" \
+                 --prefix PATH : "${tcl}/bin:${tk}/bin"
   '';
 
   meta = { 
-      description = "tool for recording, playing, editing, viewing and labeling of audio";
-      homepage = http://www.speech.kth.se/wavesurfer/;
-      license = "BSD";
+    description = "Tool for recording, playing, editing, viewing and labeling of audio";
+    homepage = http://www.speech.kth.se/wavesurfer/;
+    license = "BSD";
   };
 }