* More cleanup.

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

13 files changed, 110 insertions, 78 deletions

diff --git a/pkgs/applications/audio/ardour/default.nix b/pkgs/applications/audio/ardour/default.nix
index 0359e9c711d..c9f0fb98af7 100644
--- a/pkgs/applications/audio/ardour/default.nix
+++ b/pkgs/applications/audio/ardour/default.nix
@@ -1,7 +1,10 @@
-args: with args;
+{ stdenv, fetchurl, scons, boost, pkgconfig, fftw, librdf_raptor
+, librdf_rasqal, jackaudio, flac, libsamplerate, alsaLib, libxml2
+, libxslt, libsndfile, libsigcxx, libusb, cairomm, glib, pango
+, gtk, glibmm, gtkmm, libgnomecanvas, librdf, liblo, aubio
+, fftwSinglePrec, libmad }:
 
 stdenv.mkDerivation {
-
   name = "ardour-2.8.2";
 
   # svn is the source to get official releases from their site?
@@ -13,11 +16,10 @@ stdenv.mkDerivation {
   };
 
   buildInputs = [
-    scons boost
-    pkgconfig fftw librdf_raptor librdf_rasqal jackaudio flac
-    libsamplerate alsaLib libxml2 libxslt libsndfile libsigcxx libusb cairomm
-    glib pango gtk glibmm gtkmm libgnomecanvas fftw librdf liblo aubio
-    fftw fftwSinglePrec libmad
+    scons boost pkgconfig fftw librdf_raptor librdf_rasqal jackaudio
+    flac libsamplerate alsaLib libxml2 libxslt libsndfile libsigcxx
+    libusb cairomm glib pango gtk glibmm gtkmm libgnomecanvas librdf
+    liblo aubio fftwSinglePrec libmad
   ];
 
   buildPhase = ''
@@ -35,7 +37,7 @@ stdenv.mkDerivation {
     '';
     homepage = http://ardour.org/;
     license = "GPLv2";
-    maintainers = [args.lib.maintainers.marcweber];
-    platforms = args.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.marcweber ];
+    platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix
index 8cd98aef136..a3910fae2bf 100644
--- a/pkgs/applications/graphics/inkscape/default.nix
+++ b/pkgs/applications/graphics/inkscape/default.nix
@@ -1,4 +1,7 @@
-args: with args;
+{ stdenv, fetchurl, pkgconfig, perl, perlXMLParser, gtk, libXft
+, libpng, zlib, popt, boehmgc, libxml2, libxslt, glib, gtkmm
+, glibmm, libsigcxx, lcms, boost, gettext, makeWrapper, intltool
+, gsl, python, pyxml, lxml }:
 
 stdenv.mkDerivation rec {
   name = "inkscape-0.47";
@@ -45,6 +48,5 @@ stdenv.mkDerivation rec {
 
       If you want to import .eps files install ps2edit.
     '';
-
   };
 }
diff --git a/pkgs/applications/misc/d4x/default.nix b/pkgs/applications/misc/d4x/default.nix
index f4ad3cc8421..4eb4c441c99 100644
--- a/pkgs/applications/misc/d4x/default.nix
+++ b/pkgs/applications/misc/d4x/default.nix
@@ -1,4 +1,5 @@
-args: with args;
+{ stdenv, fetchurl, gtk, glib, pkgconfig, openssl, boost }:
+
 stdenv.mkDerivation {
   name = "d4x-2.5.7.1";
   
@@ -12,11 +13,12 @@ stdenv.mkDerivation {
   configurePhase = "./configure --prefix=\$out "
     + " --with-boost-libdir=\$boost/lib"
     + " --with-boost-includedir=\$boost/include";
-  buildInputs = [gtk glib pkgconfig openssl boost];
+    
+  buildInputs = [ gtk glib pkgconfig openssl boost ];
 
   meta = { 
-      description = "graphical download manager";
-      homepage = http://www.krasu.ru/soft/chuchelo/;
-      license = "Artistic";
+    description = "Graphical download manager";
+    homepage = http://www.krasu.ru/soft/chuchelo/;
+    license = "Artistic";
   };
 }
diff --git a/pkgs/applications/misc/grip/default.nix b/pkgs/applications/misc/grip/default.nix
index a82715fc13c..6b08069054c 100644
--- a/pkgs/applications/misc/grip/default.nix
+++ b/pkgs/applications/misc/grip/default.nix
@@ -1,4 +1,5 @@
-args: with args;
+{ stdenv, fetchurl, gtk, glib, pkgconfig, libgnome, libgnomeui, vte
+, curl, cdparanoia, libid3tag }:
 
 stdenv.mkDerivation {
   name = "grip-3.2.0";
@@ -8,13 +9,13 @@ stdenv.mkDerivation {
     sha256 = "1jh5x35rq15n8ivlp9wbdx8x9mj6agf5rfdv8sd6gai851zsclas";
   };
 
-  buildInputs = [gtk glib pkgconfig libgnome libgnomeui vte curl cdparanoia libid3tag];
+  buildInputs = [ gtk glib pkgconfig libgnome libgnomeui vte curl cdparanoia libid3tag ];
 
   meta = { 
-    description = "GTK+ based Audio CD Player/Ripper";
+    description = "GTK+-based audio CD player/ripper";
     homepage = http://nostatic.org/grip;
     license = "GPLv2";
-    maintainers = [args.lib.maintainers.marcweber];
+    maintainers = [ stdenv.lib.maintainers.marcweber ];
     #platforms = args.lib.platforms.linux;
   };
 }
diff --git a/pkgs/applications/misc/jigdo/default.nix b/pkgs/applications/misc/jigdo/default.nix
index 69ec74337df..6ceca2ea871 100644
--- a/pkgs/applications/misc/jigdo/default.nix
+++ b/pkgs/applications/misc/jigdo/default.nix
@@ -1,4 +1,4 @@
-args: with args;
+{ stdenv, fetchurl, db45, gtk, bzip2 }:
 
 stdenv.mkDerivation {
   name = "jigdo-0.7.3";
@@ -9,18 +9,18 @@ stdenv.mkDerivation {
     sha256 = "1qvqzgzb0dzq82fa1ffs6hyij655rajnfwkljk1y0mnkygnha1xv";
   };
 
-  buildInputs = [db45 gtk bzip2];
+  patches = fetchurl {
+    url = http://ftp.de.debian.org/debian/pool/main/j/jigdo/jigdo_0.7.3-2.diff.gz;
+    sha256 = "0jnlzm9m2hjlnw0zs2fv456ml5r2jj2q1lncqbrgg52lq18f6fa3";
+  };
+  
+  buildInputs = [ db45 gtk bzip2 ];
 
   configureFlags = "--without-libdb";
 
   meta = { 
-    description = "tool designed to ease the distribution of very large files over the internet";
+    description = "Download utility that can fetch files from several sources simultaneously";
     homepage = http://atterer.net/jigdo/;
     license = "GPLv2";
   };
-
-  patches = fetchurl {
-    url = http://ftp.de.debian.org/debian/pool/main/j/jigdo/jigdo_0.7.3-2.diff.gz;
-    sha256 = "0jnlzm9m2hjlnw0zs2fv456ml5r2jj2q1lncqbrgg52lq18f6fa3";
-  };
 }
diff --git a/pkgs/applications/misc/mrxvt/default.nix b/pkgs/applications/misc/mrxvt/default.nix
index e7d83fd828e..b11b234eb43 100644
--- a/pkgs/applications/misc/mrxvt/default.nix
+++ b/pkgs/applications/misc/mrxvt/default.nix
@@ -1,12 +1,13 @@
-args: with args;
-stdenv.mkDerivation {
+{ stdenv, fetchurl, libX11, libXft, libXi, inputproto, libSM, libICE
+, freetype, pkgconfig, which }:
 
+stdenv.mkDerivation {
   name = "mrxvt-0.5.4";
 
-  buildInputs = [libX11 libXft libXi inputproto libSM libICE
-    freetype pkgconfig which];
+  buildInputs =
+    [ libX11 libXft libXi inputproto libSM libICE freetype pkgconfig which ];
 
-  configureFlags=[
+  configureFlags = [
     "--with-x"
     "--enable-frills"
     "--enable-xft"
@@ -17,7 +18,7 @@ stdenv.mkDerivation {
     "--with-save-lines=10000"
   ];
 
-  preConfigure=''
+  preConfigure = ''
     NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${freetype}/include/freetype2";
   '';
 
@@ -27,10 +28,10 @@ stdenv.mkDerivation {
   };
 
   meta = { 
-    description = "lightweight multitabbed feature-rich X11 terminal emulator";
+    description = "Lightweight multitabbed feature-rich X11 terminal emulator";
     longDescription = "
     	Multitabbed lightweight terminal emulator based on rxvt. 
-	Supports transparency, backgroundimages, freetype fonts,..
+	Supports transparency, backgroundimages, freetype fonts, ...
     ";
     homepage = http://sourceforge.net/projects/materm;
     license = "GPL";
diff --git a/pkgs/applications/misc/multisync/default.nix b/pkgs/applications/misc/multisync/default.nix
index af6bc072e53..8fd04353969 100644
--- a/pkgs/applications/misc/multisync/default.nix
+++ b/pkgs/applications/misc/multisync/default.nix
@@ -1,15 +1,19 @@
-args: with args;
-
+{ stdenv, fetchurl, gtk, glib, ORBit2, libbonobo, libtool, pkgconfig
+, libgnomeui, GConf, automake, autoconf }:
 
 stdenv.mkDerivation {
   name = "multisync-0.82-1";
+  
   src = fetchurl {
     url = mirror://sourceforge/multisync/multisync-0.82-1.tar.bz2;
     sha256 = "1azb6zsn3n1rnla2qc3c440gc4vgmbj593k6xj5g1v0xha2vm2y3";
   };
-  buildInputs = [ gtk glib ORBit2 libbonobo libtool pkgconfig libgnomeui GConf
-                  automake autoconf
-                ];
+  
+  buildInputs =
+    [ gtk glib ORBit2 libbonobo libtool pkgconfig libgnomeui GConf
+      automake autoconf
+    ];
+    
   preConfigure = "./autogen.sh"; # install.sh is not contained in the tar
 
   meta = {
diff --git a/pkgs/applications/misc/qcad/default.nix b/pkgs/applications/misc/qcad/default.nix
index 00d4fe99ba3..798f9eeec20 100644
--- a/pkgs/applications/misc/qcad/default.nix
+++ b/pkgs/applications/misc/qcad/default.nix
@@ -1,5 +1,7 @@
 # translations still misssing
-args: with args;
+
+{ stdenv, fetchurl, qt3, libpng, libXext, libX11 }:
+
 stdenv.mkDerivation {
   name = "qcad-2.0.5.0-1-community";
 
@@ -15,7 +17,7 @@ stdenv.mkDerivation {
     cd ..
   '';
 
-  buildInputs = [qt3 libpng libXext libX11];
+  buildInputs = [ qt3 libpng libXext libX11 ];
 
   patchPhase = ''
     sed -i 's/-pedantic//' mkspecs/defs.pro
@@ -35,8 +37,8 @@ stdenv.mkDerivation {
   '';
 
   meta = { 
-      description="A 2D CAD package based upon Qt.";
-      homepage = http://www.ribbonsoft.de/qcad.html;
-      license = "GPLv2"; # community edition
+    description = "A 2D CAD package based upon Qt";
+    homepage = http://www.ribbonsoft.de/qcad.html;
+    license = "GPLv2"; # community edition
   };
 }
diff --git a/pkgs/applications/misc/rxvt/default.nix b/pkgs/applications/misc/rxvt/default.nix
index 58366c6aa04..13597f3ee9b 100644
--- a/pkgs/applications/misc/rxvt/default.nix
+++ b/pkgs/applications/misc/rxvt/default.nix
@@ -1,4 +1,5 @@
-args: with args;
+{ stdenv, fetchurl, libX11, libXt }:
+
 stdenv.mkDerivation {
   name = "rxvt-2.6.4";
 
@@ -10,8 +11,8 @@ stdenv.mkDerivation {
   buildInputs = [ libX11 libXt ];
 
   meta = { 
-      description = "colour vt102 terminal emulator with less features and lower memory consumption";
-      homepage = http://www.rxvt.org/;
-      license = "GPL";
+    description = "Colour vt102 terminal emulator with less features and lower memory consumption";
+    homepage = http://www.rxvt.org/;
+    license = "GPL";
   };
 }
diff --git a/pkgs/applications/misc/synergy/default.nix b/pkgs/applications/misc/synergy/default.nix
index f8c494cb8ed..cb79bf592fe 100644
--- a/pkgs/applications/misc/synergy/default.nix
+++ b/pkgs/applications/misc/synergy/default.nix
@@ -1,4 +1,6 @@
-args: with args;
+{ stdenv, fetchurl, x11, xextproto, libXtst, inputproto, libXi
+, automake, autoconf, sourceFromHead }:
+
 stdenv.mkDerivation {
   name = "synergy-cvs";
 
@@ -10,18 +12,20 @@ stdenv.mkDerivation {
                (fetchurl { url = "http://mawercer.de/~nix/repos/synergy-F_23-55-02.tar.gz"; sha256 = "ae16a9b59039a32e383e71397405d7b610de6c6902c03177c2496bac440d3e28"; });
   # END
 
-  buildInputs = [x11 xextproto libXtst inputproto libXi automake autoconf autoconf];
+  buildInputs = [ x11 xextproto libXtst inputproto libXi automake autoconf ];
 
-  preConfigure = "autoreconf; ";
+  preConfigure = "autoreconf";
 
-  patches = [ (fetchurl {
-    url = http://mawercer.de/~nix/synergy-gcc43-r2.patch.gz;
-    sha256 = "0wnj5k93ybj7jg8ml1i1brwsnszfh41117q2qh7r8xr9m37997b7";
-  }) ];
+  patches =
+    [ (fetchurl {
+        url = http://mawercer.de/~nix/synergy-gcc43-r2.patch.gz;
+        sha256 = "0wnj5k93ybj7jg8ml1i1brwsnszfh41117q2qh7r8xr9m37997b7";
+      })
+    ];
 
-  meta= { 
-      description = "share mouse keyboard and clipboard between computers";
-      homepage = http://synergy2.sourceforge.net;
-      license = "GPL";
+  meta = { 
+    description = "Tool to share the mouse keyboard and the clipboard between computers";
+    homepage = http://synergy2.sourceforge.net;
+    license = "GPL";
   };
 }
diff --git a/pkgs/applications/misc/xterm/default.nix b/pkgs/applications/misc/xterm/default.nix
index 9f6a8a59e72..55d6a9c16b0 100644
--- a/pkgs/applications/misc/xterm/default.nix
+++ b/pkgs/applications/misc/xterm/default.nix
@@ -1,16 +1,24 @@
-args: with args;
+{ stdenv, fetchurl, xorg, ncurses, freetype, pkgconfig }:
 
 stdenv.mkDerivation rec {
   name = "xterm-231";
+  
   src = fetchurl {
     url = "ftp://invisible-island.net/xterm/${name}.tgz";
     sha256 = "0qlz5nkdqkahdg9kbd1ni96n69srj1pd9yggwrw3z0kghaajb2sr";
   };
-  buildInputs = [libXaw xproto libXt libXext libX11 libSM libICE ncurses
-    freetype pkgconfig libXft luit];
-  configureFlags = "--enable-wide-chars --enable-256-color
-    --enable-load-vt-fonts --enable-i18n --enable-doublechars --enable-luit
-    --enable-mini-luit --with-tty-group=tty";
+  
+  buildInputs =
+    [ xorg.libXaw xorg.xproto xorg.libXt xorg.libXext xorg.libX11 xorg.libSM xorg.libICE
+      ncurses freetype pkgconfig xorg.libXft xorg.luit
+    ];
+    
+  configureFlags =
+    ''
+      --enable-wide-chars --enable-256-color
+      --enable-load-vt-fonts --enable-i18n --enable-doublechars --enable-luit
+      --enable-mini-luit --with-tty-group=tty
+    '';
 
   # Hack to get xterm built with the feature of releasing a possible setgid of 'utmp',
   # decided by the sysadmin to allow the xterm reporting to /var/run/utmp
diff --git a/pkgs/applications/office/abiword/default.nix b/pkgs/applications/office/abiword/default.nix
index 29aab0bf68b..6e3d57b78a8 100644
--- a/pkgs/applications/office/abiword/default.nix
+++ b/pkgs/applications/office/abiword/default.nix
@@ -1,15 +1,17 @@
-{stdenv, fetchurl, pkgconfig, gtk, libglade, libgnomecanvas, fribidi, libpng, popt, libgsf,
-enchant, wv, librsvg, bzip2
+{ stdenv, fetchurl, pkgconfig, gtk, libglade, libgnomecanvas, fribidi
+, libpng, popt, libgsf, enchant, wv, librsvg, bzip2
 }:
 
 stdenv.mkDerivation {
   name = "abiword-2.8.6";
+  
   src = fetchurl {
     url = http://www.abisource.org/downloads/abiword/2.8.6/source/abiword-2.8.6.tar.gz;
     sha256 = "059sd2apxdmcacc4pll880i7vm18h0kyjsq299m1mz3c7ak8k46r";
   };
 
-  buildInputs = [pkgconfig gtk libglade librsvg bzip2
-                 libgnomecanvas fribidi libpng popt libgsf enchant wv
-                ];
+  buildInputs =
+    [ pkgconfig gtk libglade librsvg bzip2 libgnomecanvas fribidi libpng popt
+      libgsf enchant wv
+    ];
 }
diff --git a/pkgs/applications/window-managers/jwm/default.nix b/pkgs/applications/window-managers/jwm/default.nix
index 021681e4efd..e52cb91ec4b 100644
--- a/pkgs/applications/window-managers/jwm/default.nix
+++ b/pkgs/applications/window-managers/jwm/default.nix
@@ -1,17 +1,20 @@
-args: with args;
+{ stdenv, fetchurl, libX11, libXext, libXinerama, libXpm, libXft }:
 
 stdenv.mkDerivation {
-  name="jwm-2.0.1";
+  name = "jwm-2.0.1";
+  
   src = fetchurl {
      url = http://www.joewing.net/programs/jwm/releases/jwm-2.0.1.tar.bz2;
      sha256 = "1ix5y00cmg3cyazl0adzgv49140zxaf2dpngyg1dyy4ma6ysdmnw";
   };
 
-  buildInputs = [libX11 libXext libXinerama libXpm libXft];
+  buildInputs = [ libX11 libXext libXinerama libXpm libXft ];
 
-  postInstall = ''
-    sed -i -e s/rxvt/xterm/g $out/etc/system.jwmrc
-    sed -i -e "s/.*Swallow.*\|.*xload.*//" $out/etc/system.jwmrc'';
+  postInstall =
+    ''
+      sed -i -e s/rxvt/xterm/g $out/etc/system.jwmrc
+      sed -i -e "s/.*Swallow.*\|.*xload.*//" $out/etc/system.jwmrc
+    '';
 
   meta = {
     description = "A window manager for X11 that requires only Xlib";