Merge branch master into haskell-updates haskell-updates

Conflicts from #341407 resolved.

1 files changed, 2 insertions, 2 deletions

diff --git a/pkgs/development/compilers/cakelisp/default.nix b/pkgs/development/compilers/cakelisp/default.nix
index c52c93c5e6c7e..48e3e9efa5fbb 100644
--- a/pkgs/development/compilers/cakelisp/default.nix
+++ b/pkgs/development/compilers/cakelisp/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
         --replace '"/usr/bin/g++"' '"${gcc}/bin/g++"'
     substituteInPlace src/ModuleManager.cpp \
         --replace '"/usr/bin/g++"' '"${gcc}/bin/g++"'
-  '' + lib.optionalString stdenv.isDarwin ''
+  '' + lib.optionalString stdenv.hostPlatform.isDarwin ''
     substituteInPlace Build.sh --replace '--export-dynamic' '-export_dynamic'
     substituteInPlace runtime/HotReloading.cake --replace '--export-dynamic' '-export_dynamic'
     substituteInPlace Bootstrap.cake --replace '--export-dynamic' '-export_dynamic'
@@ -50,6 +50,6 @@ stdenv.mkDerivation {
     platforms = platforms.darwin ++ platforms.linux;
     maintainers = [ maintainers.sbond75 ];
     # never built on aarch64-darwin since first introduction in nixpkgs
-    broken = stdenv.isDarwin && stdenv.isAarch64;
+    broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64;
   };
 }