* More cleanup.

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

10 files changed, 79 insertions, 72 deletions

diff --git a/pkgs/development/compilers/neko/default.nix b/pkgs/development/compilers/neko/default.nix
index ee8474947f8..060d59476cf 100644
--- a/pkgs/development/compilers/neko/default.nix
+++ b/pkgs/development/compilers/neko/default.nix
@@ -1,16 +1,17 @@
-args: with args;
+{ composableDerivation, lib, fetchurl, mysql, apacheHttpd, zlib, sqlite
+, pcre, apr, gtk, boehmgc, pkgconfig, makeWrapper, sourceFromHead }:
 
 let
 
-  inherit (args.composableDerivation) composableDerivation edf wwf;
+  inherit (composableDerivation) edf wwf;
 
-  libs = [ mysql apacheHttpd zlib sqlite pcre apr gtk];
+  libs = [ mysql apacheHttpd zlib sqlite pcre apr gtk ];
 
   includes = lib.concatMapStrings (x: ''"${x}/include",'' ) libs + ''"{gkt}/include/gtk-2.0",'';
   
 in
 
-composableDerivation {} ( fixed : {
+composableDerivation.composableDerivation {} ( fixed : {
 
   name = "neko-cvs";
 
@@ -19,11 +20,6 @@ composableDerivation {} ( fixed : {
                (fetchurl { url = "http://mawercer.de/~nix/repos/neko-F_16-06-48.tar.gz"; sha256 = "e952582a26099b7a5568d0798839a6d349331510ffe6d7936b4537d60b6ccf26"; });
   # END
 
-  # # REGION AUTO UPDATE:           { name="neko_git"; type="git"; url=""; }
-  # src = sourceFromHead "neko_git-3abfb2f6d68cc301f9795e10c75734e293b4cfa9.tar.gz"
-  #              (throw "source not not published yet: neko_git");
-  # # END
-
   # optionally remove apache mysql like gentoo does?
   # they just remove libs/{apache,mod_neko}
   buildInputs = [boehmgc pkgconfig makeWrapper] ++ libs;
@@ -47,8 +43,8 @@ composableDerivation {} ( fixed : {
     description = "Neko is an high-level dynamicly typed programming language";
     homepage = http://nekovm.org;
     license = ["GPLv2" ];  # -> docs/license.txt
-    maintainers = [args.lib.maintainers.marcweber];
-    platforms = args.lib.platforms.linux;
+    maintainers = [ lib.maintainers.marcweber ];
+    platforms = lib.platforms.linux;
   };
 
   # if stripping was done neko and nekoc would be the same. ?!
diff --git a/pkgs/development/interpreters/clisp/default.nix b/pkgs/development/interpreters/clisp/default.nix
index a6e462753da..92098dc369a 100644
--- a/pkgs/development/interpreters/clisp/default.nix
+++ b/pkgs/development/interpreters/clisp/default.nix
@@ -1,31 +1,40 @@
-args: with args;
+{ stdenv, fetchurl, libsigsegv, gettext, ncurses, readline, libX11
+, libXau, libXt, pcre, zlib, libXpm, xproto, libXext, xextproto
+, libffi, libffcall, coreutils }:
+
 stdenv.mkDerivation rec {
   v = "2.48";
   name = "clisp-${v}";
-  src =
-	fetchurl {
-		url = "mirror://gnu/clisp/release/${v}/${name}.tar.bz2";
-		sha256 = "1hix1j7zhbn37ld46d6pi6agwxski893l1zwriwkd8jr11b3zf05";
-	};
+  
+  src = fetchurl {
+    url = "mirror://gnu/clisp/release/${v}/${name}.tar.bz2";
+    sha256 = "1hix1j7zhbn37ld46d6pi6agwxski893l1zwriwkd8jr11b3zf05";
+  };
 
   inherit libsigsegv gettext coreutils;
-  buildInputs = [libsigsegv gettext ncurses readline libX11 libXau
-	libXt pcre zlib libXpm xproto libXext xextproto libffi
-	libffcall];
+  
+  buildInputs =
+    [ libsigsegv gettext ncurses readline libX11 libXau
+      libXt pcre zlib libXpm xproto libXext xextproto libffi
+      libffcall
+    ];
  
   # First, replace port 9090 (rather low, can be used)
   # with 64237 (much higher, IANA private area, not
   # anything rememberable).
   patchPhase = ''
-  sed -e 's@9090@64237@g' -i tests/socket.tst
-  sed -i 's@/bin/pwd@${coreutils}&@' src/clisp-link.in
-  find . -type f | xargs sed -e 's/-lICE/-lXau &/' -i
+    sed -e 's@9090@64237@g' -i tests/socket.tst
+    sed -i 's@/bin/pwd@${coreutils}&@' src/clisp-link.in
+    find . -type f | xargs sed -e 's/-lICE/-lXau &/' -i
   '';
 
-  configureFlags = "--with-readline builddir --with-dynamic-ffi
-  --with-module=clx/new-clx --with-module=i18n --with-module=bindings/glibc
-  --with-module=pcre --with-module=rawsock --with-module=readline
-  --with-module=syscalls --with-module=wildcard --with-module=zlib";
+  configureFlags =
+    ''
+      --with-readline builddir --with-dynamic-ffi
+      --with-module=clx/new-clx --with-module=i18n --with-module=bindings/glibc
+      --with-module=pcre --with-module=rawsock --with-module=readline
+      --with-module=syscalls --with-module=wildcard --with-module=zlib
+    '';
 
   preBuild = ''
     sed -e '/avcall.h/a\#include "config.h"' -i src/foreign.d
@@ -38,10 +47,10 @@ stdenv.mkDerivation rec {
   doCheck = false;
 
   meta = {
-	  description = "ANSI Common Lisp Implementation";
-	  homepage = http://clisp.cons.org;
-	  maintainers = [stdenv.lib.maintainers.raskin];
-	  platforms = stdenv.lib.platforms.linux;
+    description = "ANSI Common Lisp Implementation";
+    homepage = http://clisp.cons.org;
+    maintainers = [stdenv.lib.maintainers.raskin];
+    platforms = stdenv.lib.platforms.linux;
   };
 }
 
diff --git a/pkgs/development/libraries/SDL_image/default.nix b/pkgs/development/libraries/SDL_image/default.nix
index 35154e9f945..89cf52f7e5e 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 d53d011faba..6c76dafd572 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 bf4d0f504de..1454d2ec94a 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 4bec18e7eca..45442072d39 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 cd77b5d6293..8df52cf2a27 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 3e452cf81c4..e8ec3d5e659 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 ade3626918c..78487a9f323 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 e36df1da7b6..e8c3775a94b 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