From 4855d9a3df84062e99455858c698c80e108adf51 Mon Sep 17 00:00:00 2001
From: Daniel Nagy <danielnagy@posteo.de>
Date: Sun, 30 Apr 2023 23:15:00 +0200
Subject: [PATCH 1/2] .gitattributes: fix typo

---
 .gitattributes | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitattributes b/.gitattributes
index d77c01fd626e..01d363cbb1c1 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,6 +1,6 @@
 **/deps.nix linguist-generated
 **/deps.json linguist-generated
-**/deps.toml lingust-generated
+**/deps.toml linguist-generated
 **/node-packages.nix linguist-generated
 
 pkgs/applications/editors/emacs-modes/*-generated.nix linguist-generated

From 5102f0a78d71c6a5b8c8c722cba21a4a556b3754 Mon Sep 17 00:00:00 2001
From: Daniel Nagy <danielnagy@posteo.de>
Date: Sat, 15 Apr 2023 13:00:00 +0200
Subject: [PATCH 2/2] chickenPackages: separate build phase

Also use addMetaAttrs function from lib.
---
 .../compilers/chicken/5/eggDerivation.nix           | 13 +++++++++----
 pkgs/development/compilers/chicken/5/overrides.nix  |  9 +++++----
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/compilers/chicken/5/eggDerivation.nix b/pkgs/development/compilers/chicken/5/eggDerivation.nix
index 8a558a605bfb..a85a98d46cb6 100644
--- a/pkgs/development/compilers/chicken/5/eggDerivation.nix
+++ b/pkgs/development/compilers/chicken/5/eggDerivation.nix
@@ -22,25 +22,30 @@ in
 
   CSC_OPTIONS = lib.concatStringsSep " " cscOptions;
 
+  buildPhase = ''
+    runHook preBuild
+    chicken-install -cached -no-install ${lib.escapeShellArgs chickenInstallFlags}
+    runHook postBuild
+  '';
+
   installPhase = ''
     runHook preInstall
 
     export CHICKEN_INSTALL_PREFIX=$out
     export CHICKEN_INSTALL_REPOSITORY=$out/lib/chicken/${toString chicken.binaryVersion}
-    chicken-install -cached ${lib.concatStringsSep " " chickenInstallFlags}
+    chicken-install -cached ${lib.escapeShellArgs chickenInstallFlags}
 
     for f in $out/bin/*
     do
       wrapProgram $f \
-        --prefix CHICKEN_REPOSITORY_PATH : "$out/lib/chicken/${toString chicken.binaryVersion}" \
-        --suffix CHICKEN_INCLUDE_PATH : "$out/share" \
+        --prefix CHICKEN_REPOSITORY_PATH : "$out/lib/chicken/${toString chicken.binaryVersion}:$CHICKEN_REPOSITORY_PATH" \
+        --prefix CHICKEN_INCLUDE_PATH : "$CHICKEN_INCLUDE_PATH:$out/share" \
         --prefix PATH : "$out/bin:${chicken}/bin:$CHICKEN_REPOSITORY_PATH"
     done
 
     runHook postInstall
   '';
 
-  dontBuild = true;
   dontConfigure = true;
 
   meta = {
diff --git a/pkgs/development/compilers/chicken/5/overrides.nix b/pkgs/development/compilers/chicken/5/overrides.nix
index 3cc44837f23d..b471dab135bd 100644
--- a/pkgs/development/compilers/chicken/5/overrides.nix
+++ b/pkgs/development/compilers/chicken/5/overrides.nix
@@ -1,5 +1,6 @@
 { stdenv, pkgs, lib, chickenEggs }:
 let
+  inherit (lib) addMetaAttrs;
   addToBuildInputs = pkg: old: {
     buildInputs = (old.buildInputs or [ ]) ++ lib.toList pkg;
   };
@@ -14,8 +15,8 @@ let
     (addPkgConfig old) // (addToBuildInputs pkg old);
   addToPropagatedBuildInputsWithPkgConfig = pkg: old:
     (addPkgConfig old) // (addToPropagatedBuildInputs pkg old);
-  broken = old: { meta = old.meta // { broken = true; }; };
-  brokenOnDarwin = old: { meta = old.meta // { broken = stdenv.isDarwin; }; };
+  broken = addMetaAttrs { broken = true; };
+  brokenOnDarwin = addMetaAttrs { broken = stdenv.isDarwin; };
 in {
   allegro = addToBuildInputsWithPkgConfig ([ pkgs.allegro5 pkgs.libglvnd ]
     ++ lib.optionals stdenv.isDarwin [ pkgs.darwin.apple_sdk.frameworks.OpenGL ]);
@@ -85,8 +86,8 @@ in {
   zstd = addToBuildInputs pkgs.zstd;
 
   # platform changes
-  pledge = old: { meta = old.meta // { platforms = lib.platforms.openbsd; }; };
-  unveil = old: { meta = old.meta // { platforms = lib.platforms.openbsd; }; };
+  pledge = addMetaAttrs { platforms = lib.platforms.openbsd; };
+  unveil = addMetaAttrs { platforms = lib.platforms.openbsd; };
 
   # mark broken
   "ephem-v1.1" = broken;