* More cleanup.

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

5 files changed, 76 insertions, 73 deletions

diff --git a/pkgs/applications/misc/freemind/default.nix b/pkgs/applications/misc/freemind/default.nix
index f0e5f6ab0780..dd6f205eca88 100644
--- a/pkgs/applications/misc/freemind/default.nix
+++ b/pkgs/applications/misc/freemind/default.nix
@@ -1,4 +1,5 @@
-args: with args;
+{ stdenv, fetchurl, jdk, jre, ant, coreutils, gnugrep }:
+
 stdenv.mkDerivation {
   name = "freemind-0.9.0_RC_6";
 
@@ -7,43 +8,44 @@ stdenv.mkDerivation {
     sha256 = "0qxpwqmb4xd8c83zh76gczmx0hsx5m209k7p60kh7c4f25snhngf";
   };
 
-  buildInputs = [jdk ant];
+  buildInputs = [ jdk ant ];
 
-  phases="unpackPhase patchPhase buildPhase installPhase";
+  phases = "unpackPhase patchPhase buildPhase installPhase";
 
-  patchPhase=''
+  patchPhase = ''
     # There is a complain about this. I don't understand it.
     mkdir plugins/plugins
   '';
 
   buildPhase="ant dist";
-# LIBXCB_ALLOW_SLOPPY_LOCK=true :
-# don't know yet what this option really means but I'm no longer getting
-#   Checking Java Version...
-#   Locking assertion failure.  Backtrace:
-#   java: xcb_xlib.c:82: xcb_xlib_unlock: Assertion `c->xlib.lock' failed
-# this way
-# reference and more info https://bugs.launchpad.net/ubuntu/+source/sun-java5/+bug/86103
-# JDK 7 beta seems to have fixed this (bug ?)
-
-  installPhase=''
+  
+  # LIBXCB_ALLOW_SLOPPY_LOCK=true :
+  # don't know yet what this option really means but I'm no longer getting
+  #   Checking Java Version...
+  #   Locking assertion failure.  Backtrace:
+  #   java: xcb_xlib.c:82: xcb_xlib_unlock: Assertion `c->xlib.lock' failed
+  # this way
+  # reference and more info https://bugs.launchpad.net/ubuntu/+source/sun-java5/+bug/86103
+  # JDK 7 beta seems to have fixed this (bug ?)
+
+  installPhase = ''
     ensureDir $out/{bin,nix-support}
     cp -r ../bin/dist $out/nix-support
     sed -i 's/which/type -p/' $out/nix-support/dist/freemind.sh
     cat > $out/bin/freemind << EOF
     #!/bin/sh
-    export PATH=${args.coreutils}/bin:${args.gnugrep}/bin:"$PATH"
+    export PATH=${coreutils}/bin:${gnugrep}/bin:"$PATH"
     export JAVA_HOME="${jre}"
     export LIBXCB_ALLOW_SLOPPY_LOCK=true
     $out/nix-support/dist/freemind.sh
     EOF
 
     chmod +x $out/{bin/freemind,nix-support/dist/freemind.sh}
-    '';
+  '';
 
   meta = {
-      description = "mind mapping software";
-      homepage = http://freemind.sourceforge.net/wiki/index.php/Main_Page;
-      license = "GPL";
+    description = "Mind-mapping software";
+    homepage = http://freemind.sourceforge.net/wiki/index.php/Main_Page;
+    license = "GPL";
   }; 
 }
diff --git a/pkgs/applications/misc/rxvt_unicode/default.nix b/pkgs/applications/misc/rxvt_unicode/default.nix
index 74eead5e782c..029d8675ddf6 100644
--- a/pkgs/applications/misc/rxvt_unicode/default.nix
+++ b/pkgs/applications/misc/rxvt_unicode/default.nix
@@ -1,11 +1,11 @@
-args: with args;
-# args.perlSupport: enables perl interpreter support
-# see man urxvtperl for details
+{ stdenv, fetchurl, perlSupport, libX11, libXt, libXft, ncurses, perl }:
+
 let 
   name = "rxvt-unicode";
   version = "9.07";
   n = "${name}-${version}";
 in
+
 stdenv.mkDerivation (rec {
 
   name = "${n}${if perlSupport then "-with-perl" else ""}";
@@ -15,26 +15,25 @@ stdenv.mkDerivation (rec {
     sha256 = "18y5mb3cm1gawjm723q5r7yk37s9drzg39kna036i694m2667865";
   };
 
-  buildInputs = [ libX11 libXt libXft ncurses /* required to build the terminfo file */ ]
-          ++ lib.optional perlSupport perl;
+  buildInputs =
+    [ libX11 libXt libXft ncurses /* required to build the terminfo file */ ]
+    ++ stdenv.lib.optional perlSupport perl;
 
-  preConfigure=''
-    configureFlags="${if perlSupport then "--enable-perl" else "--disable-perl"}";
-    export TERMINFO=$out/share/terminfo # without this the terminfo won't be compiled by tic, see man tic
-  ''
-  # make urxvt find its perl file lib/perl5/site_perl is added to PERL5LIB automatically
-  + (if perlSupport then ''
+  preConfigure =
+    ''
+      configureFlags="${if perlSupport then "--enable-perl" else "--disable-perl"}";
+      export TERMINFO=$out/share/terminfo # without this the terminfo won't be compiled by tic, see man tic
+    ''
+    # make urxvt find its perl file lib/perl5/site_perl is added to PERL5LIB automatically
+    + stdenv.lib.optionalString perlSupport ''
       ensureDir $out/lib/perl5
       ln -s $out/{lib/urxvt,lib/perl5/site_perl}
-  '' else "");
-
-  postInstall = ''
-  '';
+    '';
 
   meta = {
-    description = "rxvt-unicode is a clone of the well known terminal emulator rxvt.";
+    description = "A clone of the well-known terminal emulator rxvt";
     longDescription = "
-      you should put this into your .bashrc
+      You should put this into your ~/.bashrc:
       export TERMINFO=~/.nix-profile/share/terminfo
     ";
     homepage = "http://software.schmorp.de/pkg/rxvt-unicode.html";
diff --git a/pkgs/applications/misc/xneur/0.8.nix b/pkgs/applications/misc/xneur/0.8.nix
index b4279bccbe5c..af942529d32f 100644
--- a/pkgs/applications/misc/xneur/0.8.nix
+++ b/pkgs/applications/misc/xneur/0.8.nix
@@ -1,26 +1,28 @@
-args: with args;
+{ stdenv, fetchurl, pkgconfig, pcre, GStreamer, glib, libxml2, aspell
+, imlib2, xorg, xosd }:
 
 stdenv.mkDerivation {
   name = "xneur-0.8.0";
+  
   src = fetchurl {
     url = http://dists.xneur.ru/release-0.8.0/tgz/xneur-0.8.0.tar.bz2;
     sha256 = "1f05bm4vqdrlm8rxwgqv89k5lhc236xg841aw4snw514g0hi2sl8";
   };
 
-  buildInputs = [libX11 pkgconfig pcre GStreamer glib libxml2 aspell
-    libXpm imlib2 xosd libXt libXext];
-
-  inherit aspell imlib2 xosd;
+  buildInputs =
+    [ xorg.libX11 pkgconfig pcre GStreamer glib libxml2 aspell
+      xorg.libXpm imlib2 xosd xorg.libXt xorg.libXext
+    ];
 
   preConfigure = ''
     sed -e 's/-Werror//' -i configure
-    sed -e 's/for aspell_dir in/for aspell_dir in $aspell /' -i configure
-    sed -e 's/for imlib2_dir in/for imlib2_dir in $imlib2 /' -i configure
-    sed -e 's/for xosd_dir in/for xosd_dir in $xosd /' -i configure
+    sed -e 's/for aspell_dir in/for aspell_dir in ${aspell} /' -i configure
+    sed -e 's/for imlib2_dir in/for imlib2_dir in ${imlib2} /' -i configure
+    sed -e 's/for xosd_dir in/for xosd_dir in ${xosd} /' -i configure
   '';
 
   meta = {
-    description = "xneur is the keyboard layout switcher.";
+    description = "Utility for switching between keyboard layouts";
   };
 
 }
diff --git a/pkgs/applications/misc/xneur/default.nix b/pkgs/applications/misc/xneur/default.nix
index 5a4bdefdea5a..e341ae6cd055 100644
--- a/pkgs/applications/misc/xneur/default.nix
+++ b/pkgs/applications/misc/xneur/default.nix
@@ -1,4 +1,5 @@
-args: with args;
+{ stdenv, fetchurl, pkgconfig, xorg, pcre, GStreamer, glib, libxml2
+, aspell, cairo, imlib2, xosd, libnotify, gtk, pango, atk }:
 
 let s = import ./src-for-default.nix; in
 
@@ -9,17 +10,17 @@ stdenv.mkDerivation rec {
     sha256 = s.hash;
   };
 
-  buildInputs = [libX11 pkgconfig pcre GStreamer glib libxml2 aspell
-    libXpm imlib2 xosd libXt libXext libXi libnotify gtk pango
-    cairo];
-
-  inherit aspell imlib2 xosd;
+  buildInputs =
+    [ xorg.libX11 pkgconfig pcre GStreamer glib libxml2 aspell cairo
+      xorg.libXpm imlib2 xosd xorg.libXt xorg.libXext xorg.libXi libnotify
+      gtk pango
+    ];
 
   preConfigure = ''
     sed -e 's/-Werror//' -i configure
-    sed -e 's/for aspell_dir in/for aspell_dir in $aspell /' -i configure
-    sed -e 's/for imlib2_dir in/for imlib2_dir in $imlib2 /' -i configure
-    sed -e 's/for xosd_dir in/for xosd_dir in $xosd /' -i configure
+    sed -e 's/for aspell_dir in/for aspell_dir in ${aspell} /' -i configure
+    sed -e 's/for imlib2_dir in/for imlib2_dir in ${imlib2} /' -i configure
+    sed -e 's/for xosd_dir in/for xosd_dir in ${xosd} /' -i configure
 
     export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${gtk}/include/gtk-2.0"
     export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${gtk}/lib/gtk-2.0/include"
@@ -31,11 +32,10 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    description = "xneur is the keyboard layout switcher.";
+    description = "Utility for switching between keyboard layouts";
     homepage = http://xneur.ru;
     license = "GPL2+";
     maintainers = [ stdenv.lib.maintainers.raskin ];
     platforms = stdenv.lib.platforms.linux;
   };
-
 }
diff --git a/pkgs/applications/misc/yate/default.nix b/pkgs/applications/misc/yate/default.nix
index 4f793b04fc85..2994ca190652 100644
--- a/pkgs/applications/misc/yate/default.nix
+++ b/pkgs/applications/misc/yate/default.nix
@@ -1,9 +1,8 @@
-args: with args;
+{ composableDerivation, fetchurl, lib, qt, openssl, autoconf, automake, pkgconfig }:
 
-let inherit (args.composableDerivation) composableDerivation edf wwf; in
-
-composableDerivation {} ( fixed : {
+let inherit (composableDerivation) edf wwf; in
 
+composableDerivation.composableDerivation {} ( fixed : {
   name = "yate2";
 
   src = fetchurl {
@@ -12,28 +11,29 @@ composableDerivation {} ( fixed : {
   };
 
   # TODO zaptel ? postgres ?
-  buildInputs = [qt openssl autoconf automake pkgconfig];
+  buildInputs = [ qt openssl autoconf automake pkgconfig ];
 
   # /dev/null is used when linking which is a impure path for the wrapper
-  preConfigure = "
-  
-  sed -i 's@,/dev/null@@' configure
-  "; 
+  preConfigure =
+    ''
+      sed -i 's@,/dev/null@@' configure
+    ''; 
 
   # --unresolved-symbols=ignore-in-shared-libs makes ld no longer find --library=yate? Why?
-  preBuild = ''
-    export NIX_LDFLAGS="-L$TMP/yate $NIX_LDFLAGS"
-    find . -type f -iname Makefile | xargs sed -i \
-      -e 's@-Wl,--unresolved-symbols=ignore-in-shared-libs@@' \
-      -e 's@-Wl,--retain-symbols-file@@'
-  '';
+  preBuild =
+    ''
+      export NIX_LDFLAGS="-L$TMP/yate $NIX_LDFLAGS"
+      find . -type f -iname Makefile | xargs sed -i \
+        -e 's@-Wl,--unresolved-symbols=ignore-in-shared-libs@@' \
+        -e 's@-Wl,--retain-symbols-file@@'
+    '';
 
   meta = { 
     description = "YATE - Yet Another Telephony Engine";
     homepage = http://yate.null.ro/;
     license = ["GPL" "MPL"]; # Yate's license is GPL with an exception for linking with OpenH323 and PWlib (licensed under MPL).
-    maintainers = [args.lib.maintainers.marcweber];
-    platforms = args.lib.platforms.linux;
+    maintainers = [ lib.maintainers.marcweber ];
+    platforms = lib.platforms.linux;
   };
 
 } )