From 1b1b7273ebba49ee0d1c7364a0bdda7293cce22b Mon Sep 17 00:00:00 2001 From: Emily Date: Wed, 15 Jul 2026 03:19:49 +0100 Subject: [PATCH] Revert "lima: fix build on Darwin by linking with lld" The ld64 issue has been fixed. This reverts commit 5ce128c4d99036a72c5c4c2044a954ebcd8e0801. --- pkgs/by-name/li/lima/package.nix | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/pkgs/by-name/li/lima/package.nix b/pkgs/by-name/li/lima/package.nix index 8d4d63925e30..c998ae4731b6 100644 --- a/pkgs/by-name/li/lima/package.nix +++ b/pkgs/by-name/li/lima/package.nix @@ -11,7 +11,6 @@ apple-sdk_15, withAdditionalGuestAgents ? false, lima-additional-guestagents, - llvmPackages, writableTmpDirAsHomeHook, versionCheckHook, testers, @@ -36,16 +35,7 @@ buildGoModule (finalAttrs: { # For checkPhase, and installPhase(required to build completion) writableTmpDirAsHomeHook ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.sigtool - # TODO: Remove when NixOS/nixpkgs#536365 reaches master. - llvmPackages.lld - ]; - - # TODO: Remove when NixOS/nixpkgs#536365 reaches master. - env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { - NIX_CFLAGS_LINK = "-fuse-ld=${lib.getExe' llvmPackages.lld "ld64.lld"}"; - }; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.sigtool ]; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_15 ];