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

diff --git a/pkgs/applications/video/dvdauthor/default.nix b/pkgs/applications/video/dvdauthor/default.nix
index 45737effcce8..8c64721bc7e5 100644
--- a/pkgs/applications/video/dvdauthor/default.nix
+++ b/pkgs/applications/video/dvdauthor/default.nix
@@ -1,17 +1,18 @@
-args:
-args.stdenv.mkDerivation {
+{ stdenv, fetchurl, imagemagick, libdvdread, libxml2, freetype, fribidi, libpng }:
+
+stdenv.mkDerivation {
   name = "dvdauthor-0.6.14";
 
-  src = args.fetchurl {
+  src = fetchurl {
     url = mirror://sourceforge/dvdauthor/dvdauthor-0.6.14.tar.gz;
     sha256 = "1x4flj3ja7m8rbc956a6ha3qk0k6zxd1y6sl826r6r7dyc91a6yx";
   };
 
-  buildInputs =(with args; [imagemagick libdvdread libxml2 freetype fribidi libpng]);
+  buildInputs = [ imagemagick libdvdread libxml2 freetype fribidi libpng ];
 
   meta = { 
-      description = "Tools for generating DVD files to be played on standalone DVD players";
-      homepage = http://dvdauthor.sourceforge.net/;
-      license = ["GPLv2"];
+    description = "Tools for generating DVD files to be played on standalone DVD players";
+    homepage = http://dvdauthor.sourceforge.net/;
+    license = ["GPLv2"];
   };
 }