Added xmacro; updated clisp - well, it compiles now...

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

2 files changed, 26 insertions, 14 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]);
 }