diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2018-04-23 19:57:14 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-23 19:57:14 +0000 |
| commit | 7c3501724a0cdebf9ce9f50f94cf6a203752a678 (patch) | |
| tree | c0f8d6be289cc899b9cddff6b321702357089582 | |
| parent | 7ab91da92994594bf911e6fbfecdc17b93728d6b (diff) | |
| parent | 83e5b55ed00a705a6425c2ac2e4e86177de9b542 (diff) | |
| download | nixlib-7c3501724a0cdebf9ce9f50f94cf6a203752a678.tar nixlib-7c3501724a0cdebf9ce9f50f94cf6a203752a678.tar.gz nixlib-7c3501724a0cdebf9ce9f50f94cf6a203752a678.tar.bz2 nixlib-7c3501724a0cdebf9ce9f50f94cf6a203752a678.tar.lz nixlib-7c3501724a0cdebf9ce9f50f94cf6a203752a678.tar.xz nixlib-7c3501724a0cdebf9ce9f50f94cf6a203752a678.tar.zst nixlib-7c3501724a0cdebf9ce9f50f94cf6a203752a678.zip | |
Merge pull request #39380 from timokau/ecl-error-handling
ecl_16_1_2: Adopt upstream error handling patch
| -rw-r--r-- | pkgs/development/compilers/ecl/16.1.2.nix | 13 | ||||
| -rw-r--r-- | pkgs/development/compilers/ecl/default.nix | 1 |
2 files changed, 12 insertions, 2 deletions
diff --git a/pkgs/development/compilers/ecl/16.1.2.nix b/pkgs/development/compilers/ecl/16.1.2.nix index 30fee77321f5..b324ec490f1a 100644 --- a/pkgs/development/compilers/ecl/16.1.2.nix +++ b/pkgs/development/compilers/ecl/16.1.2.nix @@ -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 = '' diff --git a/pkgs/development/compilers/ecl/default.nix b/pkgs/development/compilers/ecl/default.nix index e506e3aace1f..b877ca58e95b 100644 --- a/pkgs/development/compilers/ecl/default.nix +++ b/pkgs/development/compilers/ecl/default.nix @@ -53,6 +53,7 @@ stdenv.mkDerivation { meta = { inherit (s) version; description = "Lisp implementation aiming to be small, fast and easy to embed"; + homepage = https://common-lisp.net/project/ecl/; license = stdenv.lib.licenses.mit ; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; |