mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-02 07:31:26 +00:00
Elinks: Fix libgc initialization.
svn path=/nixpkgs/trunk/; revision=27046
This commit is contained in:
parent
163c51f299
commit
270ea3beec
@ -9,8 +9,10 @@ stdenv.mkDerivation rec {
|
|||||||
sha256 = "1li4vlbq8wvnigxlkzb15490y90jg6y9yzzrqpqcz2h965w5869d";
|
sha256 = "1li4vlbq8wvnigxlkzb15490y90jg6y9yzzrqpqcz2h965w5869d";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
patches = [ ./gc-init.patch ];
|
||||||
|
|
||||||
buildInputs = [ python perl ncurses x11 bzip2 zlib openssl spidermonkey guile gpm ];
|
buildInputs = [ python perl ncurses x11 bzip2 zlib openssl spidermonkey guile gpm ];
|
||||||
|
|
||||||
configureFlags =
|
configureFlags =
|
||||||
''
|
''
|
||||||
--enable-finger --enable-html-highlight --with-guile
|
--enable-finger --enable-html-highlight --with-guile
|
||||||
|
17
pkgs/applications/networking/browsers/elinks/gc-init.patch
Normal file
17
pkgs/applications/networking/browsers/elinks/gc-init.patch
Normal file
@ -0,0 +1,17 @@
|
|||||||
|
Fix libgc initialization in the presence of Guile 2.0.
|
||||||
|
|
||||||
|
--- elinks-0.12pre5/src/main/main.c 2009-07-07 14:23:17.000000000 +0200
|
||||||
|
+++ elinks-0.12pre5/src/main/main.c 2011-04-28 23:20:15.000000000 +0200
|
||||||
|
@@ -339,6 +339,11 @@ int
|
||||||
|
main(int argc, char *argv[])
|
||||||
|
{
|
||||||
|
#ifdef CONFIG_GC
|
||||||
|
+ /* Guile 2.x uses libgc too and it initializes it this way, so we
|
||||||
|
+ * must make sure to initialize it the same way, or it will just
|
||||||
|
+ * segfault. */
|
||||||
|
+ GC_all_interior_pointers = 0;
|
||||||
|
+
|
||||||
|
GC_INIT();
|
||||||
|
GC_set_warn_proc(gc_warning);
|
||||||
|
#endif
|
||||||
|
|
Loading…
Reference in New Issue
Block a user