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

diff --git a/pkgs/applications/misc/pstree/default.nix b/pkgs/applications/misc/pstree/default.nix
index 71cac8eefa7..67d3f32d53f 100644
--- a/pkgs/applications/misc/pstree/default.nix
+++ b/pkgs/applications/misc/pstree/default.nix
@@ -1,4 +1,5 @@
-args: with args;
+{ stdenv, fetchurl }:
+
 stdenv.mkDerivation rec {
   name = "pstree-2.33";
 
@@ -7,15 +8,13 @@ stdenv.mkDerivation rec {
     sha256 = "1469lrhpy6wghlvbjx6lmvh27rakq00x11cpz4n965fg11i121hg";
   };
 
-  unpackPhase="unpackFile \$src; sourceRoot=.";
+  unpackPhase = "unpackFile \$src; sourceRoot=.";
 
-  buildPhase="pwd; gcc -o pstree pstree.c";
-  installPhase="ensureDir \$out/bin; cp pstree \$out/bin";
+  buildPhase = "pwd; gcc -o pstree pstree.c";
+  installPhase = "ensureDir \$out/bin; cp pstree \$out/bin";
 
   meta = {
-      description = "show the running processes as tree";
-      # don't know the correct homepage..
-      homepage = http://fresh.t-systems-sfr.com/unix/src/misc/pstree-2.32.tar.gz;
-      license = "GPL";
-    };
+    description = "Show the set of running processes as a tree";
+    license = "GPL";
+  };
 }