summaryrefslogtreecommitdiffstats
path: root/pkgs/development/interpreters/clisp
diff options
context:
space:
mode:
authorMoritz Ulrich <moritz@tarn-vedra.de>2013-05-01 14:33:00 +0200
committerMoritz Ulrich <moritz@tarn-vedra.de>2013-05-01 14:33:00 +0200
commitff4d3d88d21a1992b0c1dd70852b50eab8526fa4 (patch)
tree64822d2fe8f84966ae587ac6c153bf7e733e2e64 /pkgs/development/interpreters/clisp
parent900a28e06dad28f55231728a9eb7f41881f46f53 (diff)
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 <moritz@tarn-vedra.de>
Diffstat (limited to 'pkgs/development/interpreters/clisp')
-rw-r--r--pkgs/development/interpreters/clisp/2.44.1.nix12
1 files 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