From 1da06da94124ebe31a639627e5cb1447bd7aec5c Mon Sep 17 00:00:00 2001
From: Mauricio Collares <mauricio@collares.org>
Date: Wed, 29 Apr 2026 13:06:42 -0300
Subject: [PATCH] ecl: import some patches from bugfix-rc branch

---
 pkgs/development/compilers/ecl/default.nix | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/pkgs/development/compilers/ecl/default.nix b/pkgs/development/compilers/ecl/default.nix
index b487be5d7dd0..12f086072b2a 100644
--- a/pkgs/development/compilers/ecl/default.nix
+++ b/pkgs/development/compilers/ecl/default.nix
@@ -31,6 +31,23 @@ stdenv.mkDerivation rec {
     hash = "sha256-QW1XB78R0rPY0z1nkUGaeG5MxZrAzD7FBe5ZtRqfXJo=";
   };
 
+  patches = [
+    # https://gitlab.com/embeddable-common-lisp/ecl/-/merge_requests/370
+    (fetchpatch {
+      name = "allocate-first_env-dynamically.patch";
+      url = "https://gitlab.com/embeddable-common-lisp/ecl/-/commit/61a14dfc6681f674ae5673856c0749fdf4af6564.patch";
+      hash = "sha256-DOn0mtlW1Bl59LxqEQiE90ZJlXDSbTbxL0s8NNL882o=";
+      includes = [ "src/c/main.d" ];
+    })
+
+    # https://gitlab.com/embeddable-common-lisp/ecl/-/work_items/838
+    (fetchpatch {
+      name = "clang-miscompilation.patch";
+      url = "https://gitlab.com/embeddable-common-lisp/ecl/-/commit/d39cc449f770c52cc4c8b297cf600d7bd53d172a.patch";
+      hash = "sha256-C+zVjAY/+hQ4Te62DQxIQsHu0AqewygmSEQpcmrA5EU=";
+    })
+  ];
+
   nativeBuildInputs = [
     libtool
     autoconf