From 03741d43de97bfa594fab5ca8e29ffebe3f4e3fa Mon Sep 17 00:00:00 2001 From: Emily Date: Wed, 15 Jul 2026 03:19:52 +0100 Subject: [PATCH] Revert "godot: fix build on darwin by linking with lld" The ld64 issue has been fixed. This reverts commit 0a930dd847a2a0d3e25ea733537138fbd64687db. --- pkgs/development/tools/godot/common.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/development/tools/godot/common.nix b/pkgs/development/tools/godot/common.nix index ac25ea3cfde6..1ff39286d4bf 100644 --- a/pkgs/development/tools/godot/common.nix +++ b/pkgs/development/tools/godot/common.nix @@ -38,7 +38,6 @@ libxkbcommon, libxrandr, libxrender, - llvmPackages, makeWrapper, mbedtls, miniupnpc, @@ -399,8 +398,6 @@ let "-I${lib.getDev harfbuzz-icu}/include/harfbuzz" "-I${lib.getDev recastnavigation}/include/recastnavigation" ]; - # TODO: Remove when NixOS/nixpkgs#536365 reaches master. - NIX_CFLAGS_LINK = "--ld-path=${lib.getExe' llvmPackages.lld "ld64.lld"}"; }; preConfigure = lib.optionalString (editor && withMono) '' @@ -646,8 +643,6 @@ let ++ lib.optionals stdenv.hostPlatform.isDarwin ( [ darwin.sigtool - # TODO: Remove when NixOS/nixpkgs#536365 reaches master. - llvmPackages.lld ] ++ lib.optionals (!editor) [ strip-nondeterminism