diff --git a/pkgs/development/interpreters/clisp/builder.sh b/pkgs/development/interpreters/clisp/builder.sh
deleted file mode 100644
index 89731fbb9874..000000000000
--- a/pkgs/development/interpreters/clisp/builder.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-source $stdenv/setup || exit 1
-
-set -e
-
-tar jxvf $src
-cd clisp-*
-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
-make install
diff --git a/pkgs/development/interpreters/clisp/default.nix b/pkgs/development/interpreters/clisp/default.nix
index db2506ae8c73..5095bf985d44 100644
--- a/pkgs/development/interpreters/clisp/default.nix
+++ b/pkgs/development/interpreters/clisp/default.nix
@@ -1,14 +1,36 @@
 args: with args;
-stdenv.mkDerivation {
-  name = "clisp-2.43";
-  builder = ./builder.sh;
+stdenv.mkDerivation rec {
+  v = "2.43";
+  name = "clisp-${v}";
   src =
 	fetchurl {
-		url = mirror://gnu/clisp/release/2.43/clisp-2.43.tar.bz2;
+		url = "mirror://gnu/clisp/release/${v}/${name}.tar.bz2";
 		sha256 = "10qyn6wccnayf1cyvrcanay6c6laar6z1r608w7ijp6nb763q8dm";
 	};
 
   inherit libsigsegv gettext coreutils;
   buildInputs = [libsigsegv gettext ncurses readline libX11 libXau
 	libXt pcre zlib];
+  
+  patchPhase = ''
+  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";
+
+  preBuild = "cd builddir";
+
+  NIX_CFLAGS_COMPILE="-O0";
+
+  # TODO : make mod-check fails
+  doCheck = 1;
+
+  meta = {
+	  description = "ANSI Common Lisp Implementation";
+	  homepage = http://clisp.cons.org;
+  };
 }