* More cleanup.

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

pkgs/development/libraries/libxklavier/default.nix

@@ -1,4 +1,5 @@
-args: with args;
+{ stdenv, fetchurl, pkgconfig, libX11, libXi, xkeyboard_config, libxml2
+, libICE, glib, libxkbfile, isocodes }:
 
 stdenv.mkDerivation rec {
   name = "libxklavier-4.0";
@@ -8,10 +9,10 @@ stdenv.mkDerivation rec {
     sha256 = "210ed5803109a8cef3b2ab1195bc73fe3385a97a8749d01673e020642d8e5a71";
   };
 
-# TODO: enable xmodmap support, needs xmodmap DB
-  propagatedBuildInputs = [libX11 libXi xkeyboard_config libxml2 libICE glib libxkbfile isocodes];
+  # TODO: enable xmodmap support, needs xmodmap DB
+  propagatedBuildInputs = [ libX11 libXi xkeyboard_config libxml2 libICE glib libxkbfile isocodes ];
   
-  buildInputs = [pkgconfig];
+  buildInputs = [ pkgconfig ];
   
   configureFlags = ''
     --with-xkb-base=${xkeyboard_config}/etc/X11/xkb