From d24a440a410371e03ecaa3e69fa029fca3a8fd9c Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Tue, 17 Feb 2026 13:53:27 +0100
Subject: [PATCH 1/2] chickenPackages_4.eggDerivation: move env variables into
 env

---
 pkgs/development/compilers/chicken/4/eggDerivation.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/chicken/4/eggDerivation.nix b/pkgs/development/compilers/chicken/4/eggDerivation.nix
index 7e334782fe78..a4eb19b8a927 100644
--- a/pkgs/development/compilers/chicken/4/eggDerivation.nix
+++ b/pkgs/development/compilers/chicken/4/eggDerivation.nix
@@ -26,10 +26,13 @@ stdenv.mkDerivation (
     nativeBuildInputs = [ makeWrapper ];
     buildInputs = [ chicken ];
 
-    CSC_OPTIONS = lib.concatStringsSep " " cscOptions;
+    env = {
+      CSC_OPTIONS = lib.concatStringsSep " " cscOptions;
 
-    CHICKEN_REPOSITORY = libPath;
-    CHICKEN_INSTALL_PREFIX = "$out";
+      CHICKEN_REPOSITORY = libPath;
+      CHICKEN_INSTALL_PREFIX = "$out";
+    }
+    // (args.env or { });
 
     installPhase = ''
       runHook preInstall

From bdf6477108865a812a7f54f20a757a9377b8ec80 Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Tue, 17 Feb 2026 13:53:37 +0100
Subject: [PATCH 2/2] chickenPackages_5.eggDerivation: move env variables into
 env

---
 pkgs/development/compilers/chicken/5/eggDerivation.nix | 5 ++++-
 pkgs/development/compilers/chicken/5/overrides.nix     | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/chicken/5/eggDerivation.nix b/pkgs/development/compilers/chicken/5/eggDerivation.nix
index 6629a30ad973..dcb8e8dbd6f4 100644
--- a/pkgs/development/compilers/chicken/5/eggDerivation.nix
+++ b/pkgs/development/compilers/chicken/5/eggDerivation.nix
@@ -41,7 +41,10 @@ in
 
     strictDeps = true;
 
-    CSC_OPTIONS = lib.concatStringsSep " " cscOptions;
+    env = {
+      CSC_OPTIONS = lib.concatStringsSep " " cscOptions;
+    }
+    // (args.env or { });
 
     buildPhase = ''
       runHook preBuild
diff --git a/pkgs/development/compilers/chicken/5/overrides.nix b/pkgs/development/compilers/chicken/5/overrides.nix
index ef48b8c0232c..1c3d7776ed94 100644
--- a/pkgs/development/compilers/chicken/5/overrides.nix
+++ b/pkgs/development/compilers/chicken/5/overrides.nix
@@ -24,7 +24,7 @@ let
   broken = addMetaAttrs { broken = true; };
   brokenOnDarwin = addMetaAttrs { broken = stdenv.hostPlatform.isDarwin; };
   addToCscOptions = opt: old: {
-    CSC_OPTIONS = lib.concatStringsSep " " ([ old.CSC_OPTIONS or "" ] ++ lib.toList opt);
+    env.CSC_OPTIONS = lib.concatStringsSep " " ([ old.env.CSC_OPTIONS or "" ] ++ lib.toList opt);
   };
 in
 {