4 files changed, 51 insertions, 15 deletions
diff --git a/pkgs/development/interpreters/clisp/builder.sh b/pkgs/development/interpreters/clisp/builder.sh
index 1c6c5a6bb3d5..89731fbb9874 100644
--- a/pkgs/development/interpreters/clisp/builder.sh
+++ b/pkgs/development/interpreters/clisp/builder.sh
@@ -4,9 +4,19 @@ set -e
 
 tar jxvf $src
 cd clisp-*
-./configure builddir --prefix=$out
+sed -e 's@/bin/pwd@'${coreutils}'&@' -i src/clisp-link.in
+./configure --with-readline builddir --build \
+	--prefix=$out --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-modules=zlib ||
+	for i in $(find . -name config.log ); do
+		echo -------
+		echo $i;
+		echo ===
+		cat $i;
+	done > /tmp/clisp-config-log
 cd builddir
-./makemake --with-dynamic-ffi --prefix=$out > Makefile
-make config.lisp
-make
 make install
diff --git a/pkgs/development/interpreters/clisp/default.nix b/pkgs/development/interpreters/clisp/default.nix
index 0cb5e2333bf1..01268ca5a616 100644
--- a/pkgs/development/interpreters/clisp/default.nix
+++ b/pkgs/development/interpreters/clisp/default.nix
@@ -1,13 +1,15 @@
-{stdenv, fetchurl, libsigsegv, gettext}:
-
-stdenv.mkDerivation {
-  name = "clisp-2.33.2";
+args:
+args.stdenv.mkDerivation {
+  name = "clisp-2.41a";
   builder = ./builder.sh;
-  src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/clisp-2.33.2.tar.bz2;
-    md5 = "ee4ea316db1e843dcb16094bf500012f";
-  };
+  src = args.
+	fetchurl {
+		url = ftp://ftp.gnu.org/pub/gnu/clisp/release/2.41/clisp-2.41a.tar.bz2;
+		sha256 = "08z35bni42dhlqlsg5rr5p025961fl82gqvaadrf0jh20jdqspqy";
+	};
 
-  inherit libsigsegv gettext;
-  buildInputs = [libsigsegv gettext];
+  inherit (args) libsigsegv gettext coreutils;
+  buildInputs = (with args;
+ [libsigsegv gettext ncurses readline libX11 libXau
+	libXt pcre zlib]);
 }
diff --git a/pkgs/tools/X11/xmacro/default.nix b/pkgs/tools/X11/xmacro/default.nix
new file mode 100644
index 000000000000..8f9231ef3e3a
--- /dev/null
+++ b/pkgs/tools/X11/xmacro/default.nix
@@ -0,0 +1,16 @@
+args:
+args.stdenv.mkDerivation {
+  name = "xmacro";
+
+  src = args.fetchurl {
+    url = http://dfn.dl.sourceforge.net/sourceforge/xmacro/xmacro-pre0.3-20000911.tar.gz;
+    md5 = "d2956b82f3d5380e58a75ccc721fb746";
+  };
+
+  preBuild=" sed -e 's/-pedantic//g' -i Makefile ";
+
+  preInstall="echo -e 'install:\n	mkdir \${out}/bin;\n	cp xmacrorec xmacrorec2 xmacroplay \${out}/bin;' >>Makefile; ";
+
+  buildInputs = (with args; 
+	[libX11 libXtst xextproto libXi inputproto]);
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 30e05ef3be92..4452293c47ff 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -920,7 +920,9 @@ rec {
 
 
   clisp = import ../development/interpreters/clisp {
-    inherit fetchurl stdenv libsigsegv gettext;
+    inherit fetchurl stdenv libsigsegv gettext 
+	readline ncurses coreutils pcre zlib;
+    inherit (xlibs) libX11 libXau libXt;
   };
 
   guile = import ../development/interpreters/guile {
@@ -3413,6 +3415,12 @@ rec {
     inherit (xlibs) libXaw xproto libXt libX11 libSM libICE;
   };
 
+  xmacro = import ../tools/X11/xmacro {
+    inherit fetchurl stdenv;
+    inherit (xlibs) libX11 libXi 
+	libXtst xextproto inputproto;
+  };
+
   xmove = import ../applications/misc/xmove {
     inherit fetchurl stdenv;
     inherit (xlibs) libX11 libXi imake libXau;