ecl_16_1_2: Adopt upstream error handling patch

2018-04-23 20:08:57 +02:00
parent 7c3dc2f53f
commit 83e5b55ed0
2 changed files with 12 additions and 2 deletions
@@ -1,9 +1,9 @@
-{stdenv, fetchurl
+{ stdenv, fetchurl, fetchpatch
 , libtool, autoconf, automake
 , gmp, mpfr, libffi, makeWrapper
 , noUnicode ? false
 , gcc
-, threadSupport ? true
+, threadSupport ? false
 }:
 let
  s = # Generated upstream information
@@ -39,6 +39,15 @@ stdenv.mkDerivation {
      "--enable-unicode")
    ;

+  patches = [
+    (fetchpatch {
+      # Avoid infinite loop, see https://gitlab.com/embeddable-common-lisp/ecl/issues/43 (fixed upstream)
+      name = "avoid-infinite-loop.patch";
+      url = "https://gitlab.com/embeddable-common-lisp/ecl/commit/caba1989f40ef917e7486f41b9cd5c7e3c5c2d79.patch";
+      sha256 = "07vw91psbc9gdn8grql46ra8lq3bgkzg5v480chnbryna4sv6lbb";
+    })
+  ];
+
  hardeningDisable = [ "format" ];

  postInstall = ''