* More cleanup.

svn path=/nixpkgs/trunk/; revision=22795

pkgs/tools/misc/gparted/default.nix

@@ -1,4 +1,6 @@
-args: with args;
+{ stdenv, fetchurl, parted, gtk, glib, intltool, gettext, libuuid
+, pkgconfig, gtkmm, gnomedocutils, libxml2 }:
+
 stdenv.mkDerivation {
   name = "gparted-0.5.1";
 
@@ -9,12 +11,14 @@ stdenv.mkDerivation {
 
   configureFlags = "--disable-doc";
 
-  buildInputs = [parted gtk glib intltool gettext libuuid pkgconfig
-    gtkmm gnomedocutils libxml2];
+  buildInputs =
+    [ parted gtk glib intltool gettext libuuid pkgconfig gtkmm
+      gnomedocutils libxml2
+    ];
 
   meta = { 
-      description = "gui partition tool";
-      homepage = http://gparted.sourceforge.net;
-      license = "GPLv2";
+    description = "Graphical disk partitioning tool";
+    homepage = http://gparted.sourceforge.net;
+    license = "GPLv2";
   };
 }

pkgs/tools/misc/xclip/default.nix

@@ -1,4 +1,5 @@
-args: with args;
+{ stdenv, fetchurl, x11, libXmu }:
+
 stdenv.mkDerivation {
   name = "xclip-0.11";
 
@@ -7,11 +8,11 @@ stdenv.mkDerivation {
     sha256 = "0ipwxkfqz66fz6jlln1v46sd2kr6bkqzq6j5hkzn6pb3grmzsacg";
   };
 
-  buildInputs = [x11 libXmu];
+  buildInputs = [ x11 libXmu ];
 
   meta = { 
-      description = "access X clipboard from this console application";
-      homepage = http://people.debian.org/~kims/xclip/;
-      license = "GPL-2";
+    description = "Tool to access the X clipboard from a console application";
+    homepage = http://people.debian.org/~kims/xclip/;
+    license = "GPL-2";
   };
 }