8 files changed, 43 insertions, 41 deletions
diff --git a/pkgs/development/libraries/SDL_image/default.nix b/pkgs/development/libraries/SDL_image/default.nix
index 35154e9f945e2..89cf52f7e5eb9 100644
--- a/pkgs/development/libraries/SDL_image/default.nix
+++ b/pkgs/development/libraries/SDL_image/default.nix
@@ -1,4 +1,4 @@
-args: with args;
+{ stdenv, fetchurl, SDL, libpng, libjpeg, libtiff, libungif, libXpm }:
 
 stdenv.mkDerivation rec {
   pname = "SDL_image";
diff --git a/pkgs/development/libraries/glew/default.nix b/pkgs/development/libraries/glew/default.nix
index d53d011faba49..6c76dafd57249 100644
--- a/pkgs/development/libraries/glew/default.nix
+++ b/pkgs/development/libraries/glew/default.nix
@@ -1,4 +1,4 @@
-args: with args;
+{ stdenv, fetchurl, mesa, x11, libXmu, libXi }:
 
 stdenv.mkDerivation {
   name = "glew-1.5.2";
@@ -8,13 +8,13 @@ stdenv.mkDerivation {
     sha256 = "0dh5wpfq7aaldkiwcqmm9w59c2qcglkjv8zazmnm8n5771n3caj8";
   };
 
-  buildInputs = [mesa x11 libXmu libXi];
+  buildInputs = [ mesa x11 libXmu libXi ];
 
+  installPhase = "GLEW_DEST=\$out make install";
+  
   meta = { 
-    description = "cross-platform open-source C/C++ extension loading library";
+    description = "Cross-platform open-source C/C++ extension loading library";
     homepage = http://glew.sourceforge.net/;
     license = ["BSD" "GLX" "SGI-B" "GPL2"]; # License description copied from gentoo-1.4.0 
   };
-
-  installPhase="GLEW_DEST=\$out make install";
 }
diff --git a/pkgs/development/libraries/glefw/default.nix b/pkgs/development/libraries/glfw/default.nix
index bf4d0f504de68..1454d2ec94a9a 100644
--- a/pkgs/development/libraries/glefw/default.nix
+++ b/pkgs/development/libraries/glfw/default.nix
@@ -1,27 +1,27 @@
-args: with args;
+{ stdenv, fetchurl, mesa, libX11, libXext }:
 
 stdenv.mkDerivation {
-  name = "glefw-2.6";
+  name = "glfw-2.6";
 
   src = fetchurl {
     url = mirror://sourceforge/glfw/glfw-2.6.tar.bz2;
     sha256 = "1jnz7szax7410qrkiwkvq34sxy11w46ybyqbkaczdyvqas6cm1hv";
   };
 
-  buildInputs = [mesa libX11 libXext];
+  buildInputs = [ mesa libX11 libXext ];
 
   buildPhase = ''
     ensureDir $out
     make x11-install PREFIX=$out
   '';
   
-  installPhase=":";
+  installPhase = ":";
 
   meta = { 
-    description = "multi-platform library for creating OpenGL contexts and managing input, including keyboard, mouse, joystick and time";
+    description = "Multi-platform library for creating OpenGL contexts and managing input, including keyboard, mouse, joystick and time";
     homepage = http://glfw.sourceforge.net/;
     license = "zlib/libpng"; # http://www.opensource.org/licenses/zlib-license.php
-    maintainers = [args.lib.maintainers.marcweber];
-    platforms = args.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.marcweber ];
+    platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/goocanvas/default.nix b/pkgs/development/libraries/goocanvas/default.nix
index 4bec18e7eca2c..45442072d39b2 100644
--- a/pkgs/development/libraries/goocanvas/default.nix
+++ b/pkgs/development/libraries/goocanvas/default.nix
@@ -1,17 +1,18 @@
-args:
-args.stdenv.mkDerivation {
+{ stdenv, fetchurl, gtk, cairo, glib, pkgconfig }:
+
+stdenv.mkDerivation {
   name = "goocanvas-0.10";
 
-  src = args.fetchurl {
+  src = fetchurl {
     url = mirror://sourceforge/goocanvas/goocanvas-0.10.tar.gz;
     sha256 = "0b49szbr3n7vpavly9w17ipa8q3ydicdcd177vxbdvbsnvg7aqp9";
   };
 
-  buildInputs =(with args; [gtk cairo glib pkgconfig]);
+  buildInputs = [ gtk cairo glib pkgconfig ];
 
   meta = { 
-      description = "canvas widget for GTK+ using the cairo 2D library";
-      homepage = http://goocanvas.sourceforge.net/;
-      license = ["GPL" "LGPL"];
+    description = "Canvas widget for GTK+ based on the the Cairo 2D library";
+    homepage = http://goocanvas.sourceforge.net/;
+    license = ["GPL" "LGPL"];
   };
 }
diff --git a/pkgs/development/libraries/gupnp/default.nix b/pkgs/development/libraries/gupnp/default.nix
index cd77b5d629328..8df52cf2a2712 100644
--- a/pkgs/development/libraries/gupnp/default.nix
+++ b/pkgs/development/libraries/gupnp/default.nix
@@ -1,4 +1,4 @@
-args: with args;
+{ stdenv, fetchurl, pkgconfig, glib, libxml2, gssdp, libsoup, e2fsprogs }:
  
 stdenv.mkDerivation {
   name = "gupnp-0.12";
@@ -8,10 +8,5 @@ stdenv.mkDerivation {
     sha256 = "1sm1rqvx752nb3j1yl7h30kx2ymndkji8m73fxshjssmc6z40ayg";
   };
 
-  buildInputs = [
-    pkgconfig glib libxml2 gssdp libsoup e2fsprogs
- #dbus.libs dbus_glib gtk glib
-  ];
-
-  #configureFlags="";
+  buildInputs = [ pkgconfig glib libxml2 gssdp libsoup e2fsprogs ];
 }
diff --git a/pkgs/development/libraries/lesstif-0.93/default.nix b/pkgs/development/libraries/lesstif-0.93/default.nix
index 3e452cf81c4aa..e8ec3d5e659a8 100644
--- a/pkgs/development/libraries/lesstif-0.93/default.nix
+++ b/pkgs/development/libraries/lesstif-0.93/default.nix
@@ -1,23 +1,25 @@
-args: with args ;
-
+{ stdenv, fetchurl, x11, libXp, libXau }:
 
 stdenv.mkDerivation {
   name = "lesstif-0.93.94";
+  
   src = fetchurl {
     url = http://prdownloads.sourceforge.net/lesstif/lesstif-0.93.94.tar.bz2;
     sha256 = "0v4l46ill6dhhswsw1hk6rqyng98d85nsr214vhd2k0mfajpig1y";
   };
+  
   buildInputs = [x11];
+  
   propagatedBuildInputs = [libXp libXau];
 
   # This is an older release of lesstif which works with arb.
-  #
-  patches = [
-    ./c-bad_integer_cast.patch    
-    ./c-xim_chained_list_crash.patch
-    ./c-render_table_crash.patch 
-    ./stdint.patch
+  patches =
+    [ ./c-bad_integer_cast.patch    
+      ./c-xim_chained_list_crash.patch
+      ./c-render_table_crash.patch 
+      ./stdint.patch
     ];
+    
   meta = {
     priority = "5";
   };
diff --git a/pkgs/development/libraries/libwpd/default.nix b/pkgs/development/libraries/libwpd/default.nix
index ade3626918cc4..78487a9f32376 100644
--- a/pkgs/development/libraries/libwpd/default.nix
+++ b/pkgs/development/libraries/libwpd/default.nix
@@ -1,9 +1,12 @@
-args: with args;
+{ stdenv, fetchurl, pkgconfig, glib, libgsf, libxml2, bzip2 }:
+
 stdenv.mkDerivation {
   name = "libwpd-0.8.14";
+  
   src = fetchurl {
     url = mirror://sourceforge/libwpd/libwpd-0.8.14.tar.gz;
     sha256 = "1syli6i5ma10cwzpa61a18pyjmianjwsf6pvmvzsh5md6yk4yx01";
   };
-  buildInputs = [pkgconfig glib libgsf libxml2 bzip2];
+  
+  buildInputs = [ pkgconfig glib libgsf libxml2 bzip2 ];
 }
diff --git a/pkgs/development/libraries/libxklavier/default.nix b/pkgs/development/libraries/libxklavier/default.nix
index e36df1da7b60b..e8c3775a94bb3 100644
--- a/pkgs/development/libraries/libxklavier/default.nix
+++ b/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