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

diff --git a/pkgs/development/libraries/libdv/default.nix b/pkgs/development/libraries/libdv/default.nix
index 69011a6ef97e..3213c0634ba2 100644
--- a/pkgs/development/libraries/libdv/default.nix
+++ b/pkgs/development/libraries/libdv/default.nix
@@ -1,6 +1,8 @@
-args: with args;
-let inherit (args.composableDerivation) composableDerivation edf; in
-composableDerivation {} {
+{ composableDerivation, fetchurl }:
+
+let inherit (composableDerivation) edf; in
+
+composableDerivation.composableDerivation {} {
 
   flags = { }
     # TODO! implement flags
@@ -14,15 +16,13 @@ composableDerivation {} {
 
   name = "libdv-1.0.0";
 
-  src = args.fetchurl {
+  src = fetchurl {
     url = mirror://sourceforge/libdv/libdv-1.0.0.tar.gz;
     sha256 = "1fl96f2xh2slkv1i1ix7kqk576a0ak1d33cylm0mbhm96d0761d3";
   };
 
   meta = {
-    description = "software decoder for DV format video, as defined by the IEC 61834 and SMPTE 314M standards";
+    description = "Software decoder for DV format video, as defined by the IEC 61834 and SMPTE 314M standards";
     homepage = http://sourceforge.net/projects/libdv/;
-    # you can choose one of the following licenses: 
-    license = [];
   };
 }