mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-11-20 08:59:32 +03:00
clisp: fix after glibc update
This commit is contained in:
parent
be88539d84
commit
bb7f1f38c2
@ -0,0 +1,12 @@
|
|||||||
|
diff -ru a/modules/bindings/glibc/linux.lisp b/modules/bindings/glibc/linux.lisp
|
||||||
|
--- a/modules/bindings/glibc/linux.lisp 2008-10-10 16:15:49.000000000 +0300
|
||||||
|
+++ b/modules/bindings/glibc/linux.lisp 2012-12-04 01:01:35.000000000 +0200
|
||||||
|
@@ -86,7 +86,7 @@
|
||||||
|
|
||||||
|
(def-c-type __key_t) ; int
|
||||||
|
|
||||||
|
-(c-lines "#include <bits/ipctypes.h>~%")
|
||||||
|
+(c-lines "#include <sys/ipc.h>~%")
|
||||||
|
(def-c-type __ipc_pid_t) ; ushort
|
||||||
|
|
||||||
|
; --------------------------- <sys/types.h> -----------------------------------
|
@ -19,13 +19,19 @@ stdenv.mkDerivation rec {
|
|||||||
libffcall
|
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 =
|
||||||
|
Loading…
Reference in New Issue
Block a user