From 05f00b2fdea22e34da51a4e3920882c2b5c14644 Mon Sep 17 00:00:00 2001
From: "Peter H. Hoeg" <peter@hoeg.com>
Date: Sun, 29 Mar 2026 11:00:51 +0200
Subject: [PATCH] buildCrystalPackage: fix env overrides

Passing variables through `env` was broken for 2 reasons:

1. due to missing parens, no merging of `env` would take place, and
2. it was impossible to override defaults due to the order
---
 pkgs/development/compilers/crystal/build-package.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/compilers/crystal/build-package.nix b/pkgs/development/compilers/crystal/build-package.nix
index 31d491236a6b..888872d7afcc 100644
--- a/pkgs/development/compilers/crystal/build-package.nix
+++ b/pkgs/development/compilers/crystal/build-package.nix
@@ -108,11 +108,12 @@ stdenv.mkDerivation (
         ++ [ "runHook postConfigure" ]
       ));
 
-    env = args.env or { } // {
+    env = {
       CRFLAGS = lib.concatStringsSep " " defaultOptions;
 
       PREFIX = placeholder "out";
-    };
+    }
+    // (args.env or { });
 
     inherit enableParallelBuilding;
     strictDeps = true;
@@ -205,8 +206,9 @@ stdenv.mkDerivation (
         done
       '';
 
-    meta = args.meta or { } // {
-      platforms = args.meta.platforms or crystal.meta.platforms;
-    };
+    meta = {
+      platforms = crystal.meta.platforms;
+    }
+    // (args.meta or { });
   }
 )