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

diff --git a/pkgs/tools/misc/debootstrap/default.nix b/pkgs/tools/misc/debootstrap/default.nix
index fd081940577..53027246b7f 100644
--- a/pkgs/tools/misc/debootstrap/default.nix
+++ b/pkgs/tools/misc/debootstrap/default.nix
@@ -1,9 +1,12 @@
-args: with args;
+{ stdenv, fetchurl, dpkg, gettext, gawk, perl, wget }:
 
-let devices = fetchurl {
+let
+
+  devices = fetchurl {
     url = mirror://gentoo/distfiles/devices.tar.gz;
     sha256 = "0j4yhajmlgvbksr2ij0dm7jy3q52j3wzhx2fs5lh05i1icygk4qd";
   };
+  
 in
 
 stdenv.mkDerivation {
@@ -14,11 +17,13 @@ stdenv.mkDerivation {
     url = mirror://debian/pool/main/d/debootstrap/debootstrap_1.0.10lenny1_all.deb;
     sha256 = "a70af8e3369408ce9d6314fb5219de73f9523b347b75a3b07ee17ea92c445051";
   };
-  buildInputs = [dpkg gettext gawk perl];
+  
+  buildInputs = [ dpkg gettext gawk perl ];
 
   unpackPhase = ''
     dpkg-deb --extract "$src" .
   '';
+  
   buildPhase = ":";
 
   patches = [
@@ -80,12 +85,10 @@ stdenv.mkDerivation {
   */
 
   meta = { 
-    description = "create a debian system in a chroot easily.";
-    longDescription = "this way you can use debian packages we don't have in nixpkgs yet.
-      ";
+    description = "Tool to create a Debian system in a chroot";
     homepage = http://packages.debian.org/de/lenny/debootstrap; # http://code.erisian.com.au/Wiki/debootstrap
     license = "GPL-2"; # gentoo says so.. ?
-    maintainers = [args.lib.maintainers.marcweber];
-    platforms = args.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.marcweber ];
+    platforms = stdenv.lib.platforms.linux;
   };
 }