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

diff --git a/pkgs/tools/misc/ttf2pt1/default.nix b/pkgs/tools/misc/ttf2pt1/default.nix
index 870c5b1e121f1..c112afaee0f43 100644
--- a/pkgs/tools/misc/ttf2pt1/default.nix
+++ b/pkgs/tools/misc/ttf2pt1/default.nix
@@ -1,4 +1,5 @@
-args: with args;
+{ stdenv, fetchurl, perl, freetype }:
+
 stdenv.mkDerivation {
   name = "ttf2pt1-3.4.4";
 
@@ -17,12 +18,13 @@ stdenv.mkDerivation {
     makeFlags="INSTDIR=$out OWNER=`id -u`"
   '';
 
-  buildInputs = [freetype];
+  buildInputs = [ freetype ];
+  
   patches = ./gentoo-makefile.patch; # also contains the freetype patch
 
   meta = { 
-      description = "True Type to Postscript Type 3 converter, fpdf";
-      homepage = "http://ttf2pt1.sourceforge.net/index.html";
-      license = "ttf2pt1";
+    description = "True Type to Postscript Type 3 converter, fpdf";
+    homepage = "http://ttf2pt1.sourceforge.net/index.html";
+    license = "ttf2pt1";
   };
 }