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

diff --git a/pkgs/tools/video/swftools/default.nix b/pkgs/tools/video/swftools/default.nix
index 4249d32b3ce..806a0b21096 100644
--- a/pkgs/tools/video/swftools/default.nix
+++ b/pkgs/tools/video/swftools/default.nix
@@ -1,24 +1,18 @@
-args:
-args.stdenv.mkDerivation {
-  # snapshot version does'nt compile
-  #name = "swftools-2008-10-13-1554";
-  name = "swftools-0.8.1";
+{ stdenv, fetchurl, zlib }:
 
-  src = args.fetchurl {
-    #url = http://www.swftools.org/swftools-2008-10-13-1554.tar.gz;
-    #sha256 = "05r2qg8yc6lpj5263jyrdykr2vkq9rlyqxydx0rnfnkqpr7s6931";
+stdenv.mkDerivation {
+  name = "swftools-0.8.1";
 
+  src = fetchurl {
     url = http://www.swftools.org/swftools-0.8.1.tar.gz;
     sha256 = "0l75c3ibwd24g9nqghp1rv1dfrlicw87s0rbdnyffjv4izz6gc2l";
   };
 
-  buildInputs =(with args; [zlib 
-                            # the following are not needed to compile 0.8.1
-                            libjpeg giflib freetype]);
+  buildInputs = [ zlib ];
 
   meta = { 
-      description = "collection of SWF manipulation and creation utilities";
-      homepage = http://www.swftools.org/about.html;
-      license = "GPLv2";
-    };
+    description = "Collection of SWF manipulation and creation utilities";
+    homepage = http://www.swftools.org/about.html;
+    license = "GPLv2";
+  };
 }