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

diff --git a/pkgs/applications/misc/pgadmin/default.nix b/pkgs/applications/misc/pgadmin/default.nix
index 94b68fc6bc9e..6d4fa97c8cb7 100644
--- a/pkgs/applications/misc/pgadmin/default.nix
+++ b/pkgs/applications/misc/pgadmin/default.nix
@@ -1,4 +1,5 @@
-args: with args;
+{ stdenv, fetchurl, postgresql, wxGTK, libxml2, libxslt, openssl }:
+
 stdenv.mkDerivation rec {
   name = "pgadmin3-1.10.0";
 
@@ -7,11 +8,11 @@ stdenv.mkDerivation rec {
     sha256 = "1ndi951da3jw5800fjdgkbvl8n6k71x7x16ghihi1l88bilf2a16";
   };
 
-  buildInputs = [postgresql wxGTK libxml2 libxslt openssl];
+  buildInputs = [ postgresql wxGTK libxml2 libxslt openssl ];
 
   meta = { 
-      description = "postgresql admin gui tool";
-      homepage = http://www.pgadmin.org;
-      license = "GPL2";
-    };
+    description = "PostgreSQL administration GUI tool";
+    homepage = http://www.pgadmin.org;
+    license = "GPL2";
+  };
 }