From ff4d3d88d21a1992b0c1dd70852b50eab8526fa4 Mon Sep 17 00:00:00 2001 From: Moritz Ulrich Date: Wed, 1 May 2013 14:33:00 +0200 Subject: [PATCH] Fix clisp 2.44.1 (needed by stumpwm). This fix applies the patch used for the newest clisp to the old, fixing errors with new glibc. Signed-off-by: Moritz Ulrich --- pkgs/development/interpreters/clisp/2.44.1.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/clisp/2.44.1.nix b/pkgs/development/interpreters/clisp/2.44.1.nix index 891fd809bf04..521933b0ed1f 100644 --- a/pkgs/development/interpreters/clisp/2.44.1.nix +++ b/pkgs/development/interpreters/clisp/2.44.1.nix @@ -14,16 +14,22 @@ stdenv.mkDerivation rec { buildInputs = [ libsigsegv gettext ncurses readline libX11 libXau libXt pcre zlib libXpm xproto libXext xextproto libffi libffcall ]; - + + patches = [ ./bits_ipctypes_to_sys_ipc.patch ]; # from Gentoo + # First, replace port 9090 (rather low, can be used) # with 64237 (much higher, IANA private area, not # anything rememberable). - patchPhase = '' + # Also remove reference to a type that disappeared from recent glibc + # (seems the correct thing to do, found no reference to any solution) + postPatch = '' sed -e 's@9090@64237@g' -i tests/socket.tst sed -i 's@/bin/pwd@${coreutils}&@' src/clisp-link.in find . -type f | xargs sed -e 's/-lICE/-lXau &/' -i - ''; + substituteInPlace modules/bindings/glibc/linux.lisp --replace "(def-c-type __swblk_t)" "" + ''; + configureFlags = '' --with-readline builddir --with-dynamic-ffi