Merge pull request #494 from the-kenny/fix-clisp-2-44-1

clisp-2.44.1: fix build (needed by stumpwm).
This commit is contained in:
Vladimír Čunát 2013-05-01 05:40:29 -07:00
commit dcbb821e78

View File

@ -14,16 +14,22 @@ stdenv.mkDerivation rec {
buildInputs = buildInputs =
[ libsigsegv gettext ncurses readline libX11 libXau libXt pcre [ libsigsegv gettext ncurses readline libX11 libXau libXt pcre
zlib libXpm xproto libXext xextproto libffi libffcall ]; 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) # First, replace port 9090 (rather low, can be used)
# with 64237 (much higher, IANA private area, not # with 64237 (much higher, IANA private area, not
# anything rememberable). # 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 -e 's@9090@64237@g' -i tests/socket.tst
sed -i 's@/bin/pwd@${coreutils}&@' src/clisp-link.in sed -i 's@/bin/pwd@${coreutils}&@' src/clisp-link.in
find . -type f | xargs sed -e 's/-lICE/-lXau &/' -i find . -type f | xargs sed -e 's/-lICE/-lXau &/' -i
'';
substituteInPlace modules/bindings/glibc/linux.lisp --replace "(def-c-type __swblk_t)" ""
'';
configureFlags = configureFlags =
'' ''
--with-readline builddir --with-dynamic-ffi --with-readline builddir --with-dynamic-ffi